ports/134357: Fix multimedia/libdvdnav with libdvdcss shared lib bump

[Joseph S. Atkinson]

>Number:         134357
>Category:       ports
>Synopsis:       Fix multimedia/libdvdnav with libdvdcss shared lib bump
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 08 03:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Joseph S. Atkinson
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 7.2-RELEASE #0: Sat May  2 00:21:11 EDT 2009
    jsa at mephisto.wickedmachine.net:/usr/obj/usr/src/sys/MEPHISTO



>Description:


recently, multimedia/libdvdcss bumped shared object version from 2 to 3. libdvdnav attempts a hardcoded dlopen the hardcoded so.2. This fixes the issue, and makes it easy to bump the shared lib version in the future.

Additionally, because libdvdnav contains an embedded non-optional dvdread, remove appearntly needless dependence on libdvdread.


>How-To-Repeat:





>Fix:


--- libdvdnav_libdvdcss_fix.diff begins here ---
--- Makefile.orig	2009-05-07 21:27:23.000000000 -0400
+++ Makefile	2009-05-07 22:27:56.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdnav
 PORTVERSION=	0.1.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvd
@@ -15,8 +15,6 @@
 MAINTAINER=	nobutaka at FreeBSD.org
 COMMENT=	The library for the xine-dvdnav plugin
 
-LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
-
 CONFLICTS=	libdvdnav-mplayer-[0-9]*
 
 CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -25,6 +23,9 @@
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15 autoconf:262 automake:16
 
+# Internal libdvdread staticly dlopens libdvdcss.so.2
+DVDCSS_LIBVERSION=	3
+
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|THREAD_LIBS="[^"]*"$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
@@ -33,6 +34,8 @@
 		 s|-I/usr/local/include|-I${LOCALBASE}/include|g' \
 		 ${WRKSRC}/configure ${WRKSRC}/configure.ac \
 		 ${WRKSRC}/missing ${WRKSRC}/aclocal.m4 ${WRKSRC}/autogen.sh
+	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
+		${WRKSRC}/src/dvdread/dvd_input.c
 
 post-configure:
 	${REINPLACE_CMD} -e 's|automake[0-9][0-9]|${TRUE}|' \
--- libdvdnav_libdvdcss_fix.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: