package/mplayer: Fix linking with libvorbis/libdvdread
PATCH v2 1/1 package/mplayer: Fix linking with libvorbis/libdvdread
Fixes
http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/
http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/
http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/
http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/
---
v2: adjust mplayer.mk to match mplayer/configure behaviour
by fixing libdvdread and libvorbis support (Thomas)
package/mplayer/mplayer.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
package/mplayer/mplayer.mk +4 -2
@@ -117,9 +117,10 @@ endif # https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch MPLAYER_CONF_OPTS += --disable-libcdio +# We intentionally don't pass --enable-dvdread, to let the +# autodetection find which library to link with. ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) MPLAYER_CONF_OPTS += \ - --enable-dvdread \ --with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config MPLAYER_DEPENDENCIES += libdvdread endif
@@ -175,9 +176,10 @@ MPLAYER_DEPENDENCIES += tremor MPLAYER_CONF_OPTS += --enable-tremor endif +# We intentionally don't pass --enable-libvorbis, to let the +# autodetection find which library to link with. ifeq ($(BR2_PACKAGE_LIBVORBIS),y) MPLAYER_DEPENDENCIES += libvorbis -MPLAYER_CONF_OPTS += --enable-libvorbis endif ifeq ($(BR2_PACKAGE_LIBMAD),y)
Signature · 1 line
2.6.2
PATCH v2 1/1 package/mplayer: Fix linking with libvorbis/libdvdread
Dear Bernd Kuhls,
Quoted 7 lines · Bernd Kuhls
Fixes
http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/
http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/
http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/
http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/Signed-off-by Bernd Kuhls <[email protected]>
Although this indeed fixes the problem, there is one missing thing here (which can be done in a separate patch). We will have the same problem with dvdnav in the future. The reason why --enable-dvdread causes a failure and --enable-dvdnav don't is because there is an error in the configure script which doesn't disable the autodetection when --enable-dvdnav is passed. That error could be fixed in the future and we will face the same problem that we are fixing here, but for dvdnav. So, --enable-dvdnav has to be removed as well, although it can be done in a different patch.
Regards,
Vincent.
Quoted 36 lines
---
v2: adjust mplayer.mk to match mplayer/configure behaviour
by fixing libdvdread and libvorbis support (Thomas)package/mplayer/mplayer.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)package/mplayer/mplayer.mk +4
-2@@ -117,9 +117,10 @@ endif # https://github.com/pld-linux/mplayer/blob/master/mplayer-libcdio.patch MPLAYER_CONF_OPTS += --disable-libcdio +# We intentionally don't pass --enable-dvdread, to let the +# autodetection find which library to link with. ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) MPLAYER_CONF_OPTS += \ - --enable-dvdread \ --with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config MPLAYER_DEPENDENCIES += libdvdread endif@@ -175,9 +176,10 @@ MPLAYER_DEPENDENCIES += tremor MPLAYER_CONF_OPTS += --enable-tremor endif +# We intentionally don't pass --enable-libvorbis, to let the +# autodetection find which library to link with. ifeq ($(BR2_PACKAGE_LIBVORBIS),y) MPLAYER_DEPENDENCIES += libvorbis -MPLAYER_CONF_OPTS += --enable-libvorbis endif ifeq ($(BR2_PACKAGE_LIBMAD),y)
Thomas Petazzoni
AppliedPATCH v2 1/1 package/mplayer: Fix linking with libvorbis/libdvdread
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 10 lines · Bernd Kuhls
Fixes
http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/
http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/
http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/
http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/Signed-off-by Bernd Kuhls <[email protected]>---
v2: adjust mplayer.mk to match mplayer/configure behaviour
by fixing libdvdread and libvorbis support (Thomas)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com