Commit Graph

24 Commits

Author SHA1 Message Date
Thomas Petazzoni
a3bc78b13b minidlna, libsvg: do not use libjpeg directly, use jpeg
libjpeg should not be selected directly, as it is one implementation
of the virtual jpeg package. Consequently, this commit moves minidlna
and libsvg to use the jpeg virtual package instead.

The build has been tested with both libjpeg and jpeg-turbo variants.

Fixes:

  http://autobuild.buildroot.org/results/a12/a12760dea9e9d7ca62d14d0821539cc4b0c76835/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-30 12:21:59 +01:00
Gustavo Zacarias
071d4f47bf minidlna: comma separate licenses
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-12-15 22:02:57 +01:00
Yann E. MORIN
de5bfeac56 package/minidlna: fix static build
libvorbis.pc does not exist, it is named vorbis.pc.
Also, sqlite3 was missing when querying pkg-config.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-11-19 10:49:34 +01:00
Gustavo Zacarias
06d653d67d minidlna: bump to version 1.1.5
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-10-02 21:51:25 +02:00
Bernd Kuhls
889a4a8d4f package/minidlna: Fix static compile
Fixes
http://autobuild.buildroot.net/results/aeb/aeb5481526497a01ada8ee9403f282a2374b0383/
http://autobuild.buildroot.net/results/255/25536df514477f3210caf4af27f2f107683f7fb2/
http://autobuild.buildroot.net/results/fa1/fa11cb360190b02d08e74997b0abc73079760dfa/
and many others

This is a follow-up for these patches:
http://patchwork.ozlabs.org/patch/493360/
http://patchwork.ozlabs.org/patch/416007/

[Thomas:
  - don't pass --static to pkg-config, since our pkg-config wrapper
    already passes it automatically when BR2_STATIC_LIBS=y.
  - make only one call to pkg-config for all three libraries
  - put the libintl logic separately from the definition of
    MINIDLNA_CONF_ENV.]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-26 15:17:08 +02:00
Aurélien Chabot
dcd309f333 minidlna: fix systemd service activation symlink
Signed-off-by: Aurélien Chabot <aurelien@chabot.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-13 20:41:42 +02:00
Aurélien Chabot
1f361b26e8 minidlna: install the config file on the target
Signed-off-by: Aurélien Chabot <aurelien@chabot.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 14:33:00 +01:00
Aurélien Chabot
84b13410b9 minidlna: add init script for sysv and systemd
[Thomas: add a sleep 1 between stop and start, otherwise minidlnad
does not restart properly.]

Signed-off-by: Aurélien Chabot <aurelien@chabot.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-08 14:32:31 +01:00
Thomas Petazzoni
665e13c85e Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.

As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.

This also helps preparing the addition of other options to select
shared, shared+static or just static.

Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
2014-12-11 22:48:13 +01:00
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Bernd Kuhls
9bf9856f3d package/minidlna: Bump version to 1.1.4
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-04 17:25:40 +02:00
Bernd Kuhls
fd0b7adb42 package/minidlna: Bump version to 1.1.3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-13 14:38:50 +02:00
Bernd Kuhls
9243374346 package/minidlna: Always depend on host-gettext
Fixes
http://autobuild.buildroot.net/results/7d1/7d10e2c13a1caf61b8bd18b85e5e5af50e5e7c48/

checking for msgfmt... no

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-13 14:38:49 +02:00
Bernd Kuhls
4b02c64a2f minidlna: bump version to 1.1.2
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-15 21:35:53 +01:00
Bernd Kuhls
9ff640ae30 minidlna: needs gettext and host-gettext tools if locale is enabled
Fixes http://autobuild.buildroot.net/results/c6b/c6baebe005d6c024514bb1ade5ca391ea341c239/

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-15 21:32:45 +01:00
Peter Korsgaard
822b3f0b0f minidlna: fix static linking
The configure script / Makefile forgets to link with some of the dependent
libraries breaking static linking, so help it along.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-08 09:00:11 +01:00
Bernd Kuhls
40ce42121c minidlna: bump version to 1.1.1
- remove all patches needed for pre-autotools minidlna release
- convert .mk file to autotools-package
- disable broken static build
- compile-tested only with ffmpeg 1.2.4 (see other patch)

[Peter: fix license filename]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-07 23:50:08 +01:00
Thomas De Schampheleire
3d86d29bf0 packages: remove package clean commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-08 19:42:34 +01:00
Thomas De Schampheleire
eb7bd9ef61 packages: remove uninstall commands
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-06 09:40:40 +01:00
Gustavo Zacarias
aab5d679e7 minidlna: fix build failure
With the 1.0.26 version bump a new routine was added to find newer
versions of ffmpeg and/or libav on different include paths.
Unfortunately this uses absolute pathnames hence when there's no
matching ffmpeg/libav headers on the host it fails to build. Fixes:
http://autobuild.buildroot.net/results/20a/20a1b3a9f040d2207b6c533a158e9747054ddd2d/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-08 17:05:12 +02:00
Gustavo Zacarias
97c386e458 minidlna: security bump to version 1.0.26
Fixes CVE-2013-2738, CVE-2013-2739 and CVE-2013-2745.
Also needs threads, which fixes:
http://autobuild.buildroot.net/results/d91/d91b64c93097580e1da53b6ccfb4b492f382a5f3

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-07 22:16:51 +02:00
Markos Chandras
86116e4f25 minidlna: Fix automagic dependency to libiconv
minidlna will detect and use the libiconv library if
the package is selected. In that case, we need to link
against -liconv.

Fixes the following linking problem:

tagutils/tagutils.o: In function `do_iconv.constprop.6':
tagutils.c:(.text+0x4d5c): undefined reference to `libiconv_open'
tagutils.c:(.text+0x4da0): undefined reference to `libiconv'
tagutils.c:(.text+0x4e08): undefined reference to `libiconv_close'

[Peter: wrap COMMON_LIBS line]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 00:16:25 +02:00
Peter Korsgaard
2b10ef9f09 minidlna: fix linking with libintl if present
Fixes http://autobuild.buildroot.net/results/3b7/3b71243716dc193a11508a69265cdd0120bd13ed

There's unfortunately not any easy way of adding extra libraries to LIBS,
so we need to list them all here.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-11 15:09:33 +02:00
Simon Dawson
7bf659ab11 minidlna: new package
[Peter: license is GPLv2, fix license file, drop unneeded standard include]
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-11 07:14:39 +02:00