Skip to contentSkip to conversation

Fix libdvdread and libdvdnav support v2

PATCH New Valentine Barshak 1 participant 4 messages Sep 27, 2012

lore
Share & tools
lore

Valentine Barshak

author
#0 lore raw

cover Fix libdvdread and libdvdnav support v2

The following patches fix dvdread-config and dvdnav-config scripts installed to staging directory and make mplayer use these libraries when they are enabled. Otherwise DVD support is disabled in mplayer config.

This is the updated patch set, that has the comments by Thomas Petazzoni addressed.

These patches have been tested on an x86 machine.

Thanks,
Val.

author
#1 lore raw

PATCH 1/3 libdvdread: Fix dvdread-config

This fixes path prefix in the staging dvdread-config and removes dvdread-config from the target filesystem if BR2_HAVE_DEVFILES is not set.

Signed-off-by Valentine Barshak <[email protected]>
---
 package/libdvdread/libdvdread.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/libdvdread/libdvdread.mk +14 -0
index 6e17731..6e64bdd 100644
@@ -11,4 +11,18 @@ LIBDVDREAD_AUTORECONF = YES
 LIBDVDREAD_LIBTOOL_PATCH = YES
 LIBDVDREAD_INSTALL_STAGING = YES
 
+define LIBDVDREAD_TARGET_CLEANUP
+	$(RM) -f $(TARGET_DIR)/usr/bin/dvdread-config
+endef
+
+ifeq ($(BR2_HAVE_DEVFILES),)
+LIBDVDREAD_POST_INSTALL_TARGET_HOOKS += LIBDVDREAD_TARGET_CLEANUP
+endif
+
+define LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
+	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdread-config
+endef
+
+LIBDVDREAD_POST_INSTALL_STAGING_HOOKS += LIBDVDREAD_STAGING_FIXUP_DVDREAD_CONFIG
+
 $(eval $(autotools-package))
Signature · 1 line
1.7.11.4
author
#2 lore raw

PATCH 2/3 libdvdnav: Fix dvdnav-config

In reply to Valentine Barshak

This fixes path prefix in the staging dvdnav-config and removes dvdnav-config from the target filesystem if BR2_HAVE_DEVFILES is not set.

Signed-off-by Valentine Barshak <[email protected]>
---
 package/libdvdnav/libdvdnav.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/libdvdnav/libdvdnav.mk +14 -0
index e2d42f3..099ba8e 100644
@@ -16,4 +16,18 @@ LIBDVDNAV_DEPENDENCIES = libdvdread host-pkg-config
 # of cross compilation, we prefer using pkg-config.
 LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 
+define LIBDVDNAV_TARGET_CLEANUP
+	$(RM) -f $(TARGET_DIR)/usr/bin/dvdnav-config
+endef
+
+ifeq ($(BR2_HAVE_DEVFILES),)
+LIBDVDNAV_POST_INSTALL_TARGET_HOOKS += LIBDVDNAV_TARGET_CLEANUP
+endif
+
+define LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
+	$(SED) "s,prefix=/usr,prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/dvdnav-config
+endef
+
+LIBDVDNAV_POST_INSTALL_STAGING_HOOKS += LIBDVDNAV_STAGING_FIXUP_DVDNAV_CONFIG
+
 $(eval $(autotools-package))
Signature · 1 line
1.7.11.4
author
#3 lore raw

PATCH 3/3 mplayer: Fix DVD support

In reply to Valentine Barshak

This sets paths to dvdread-config and dvdnav-config, and configuration options to enable external libdvdread and libdvdnav support when these libraries are enabled. Otherwise DVD support is disabled.

Signed-off-by Valentine Barshak <[email protected]>
---
 package/multimedia/mplayer/mplayer.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
package/multimedia/mplayer/mplayer.mk +20 -0
index 05120bf..0458507 100644
@@ -42,6 +42,26 @@ else
 MPLAYER_CONF_OPTS += --disable-freetype
 endif
 
+MPLAYER_CONF_OPTS += --disable-dvdread-internal
+
+ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
+MPLAYER_CONF_OPTS +=  \
+	--enable-dvdread \
+	--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
+MPLAYER_DEPENDENCIES += libdvdread
+else
+MPLAYER_CONF_OPTS += --disable-dvdread
+endif
+
+ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
+MPLAYER_CONF_OPTS +=  \
+	--enable-dvdnav \
+	--with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
+MPLAYER_DEPENDENCIES += libdvdnav
+else
+MPLAYER_CONF_OPTS += --disable-dvdnav
+endif
+
 ifeq ($(BR2_PACKAGE_MPLAYER_MPLAYER),y)
 MPLAYER_CONF_OPTS += --enable-mplayer
 else
Signature · 1 line
1.7.11.4