Attachment 93939 Details for Bug 131969 – patch-libdvdnav.txt

[patch] patch-libdvdnav.txt

patch-libdvdnav.txt (text/plain), 12.35 KB, created by Ganael LAPLANCHE on 2010-08-31 13:19:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2010-08-31 13:19:56 UTC

Size: 12.35 KB

patch

obsolete

>diff -aurN multimedia/libdvdnav.orig/Makefile multimedia/libdvdnav/Makefile
>--- multimedia/libdvdnav.orig/Makefile	2009-09-19 19:54:43.000000000 +0000
>+++ multimedia/libdvdnav/Makefile	2010-08-29 15:52:20.147020291 +0000
>@@ -6,38 +6,44 @@
> #
> 
> PORTNAME=	libdvdnav
>-PORTVERSION=	0.1.10
>-PORTREVISION=	5
>+PORTVERSION=	4.1.3
> CATEGORIES=	multimedia
>-MASTER_SITES=	SF/dvd/${PORTNAME}/${PORTVERSION}
>-
>-MAINTAINER=	nobutaka@FreeBSD.org
>-COMMENT=	The library for the xine-dvdnav plugin
>-
>+MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		http://www3.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		http://www4.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		http://www5.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		ftp://ftp1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
>+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/
>+DISTNAME=	libdvdnav-${PORTVERSION}
>+
>+MAINTAINER=	ganael.laplanche@martymac.com
>+COMMENT=	MPlayer version of the libdvdnav project
>+
>+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
>+
>+USE_BZIP2=	yes
>+CFLAGS+=	"-I${LOCALBASE}/include"
>+LDFLAGS+=	"-L${LOCALBASE}/lib"
>+HAS_CONFIGURE=	yes
>+CONFIGURE_SCRIPT=	configure2
>+CONFIGURE_ARGS=	--prefix="${PREFIX}" \
>+		--libdir="${PREFIX}/lib" \
>+		--libdatadir="${PREFIX}/libdata/pkgconfig" \
>+		--shlibdir="${PREFIX}/lib" \
>+		--incdir="${PREFIX}/include/dvdnav" \
>+		--disable-opts \
>+		--disable-debug \
>+		--extra-cflags="${CFLAGS}" \
>+		--extra-ldflags="${LDFLAGS}"
>+USE_GMAKE=	yes
> CONFLICTS=	libdvdnav-mplayer-[0-9]*
>-
>-CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>-		THREAD_LIBS="${PTHREAD_LIBS}"
>-CONFIGURE_ARGS=	--program-transform-name=''
> USE_LDCONFIG=	yes
>-USE_AUTOTOOLS=	libtool:22 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 ; \
>-		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
>-		 s|-L/usr/local/lib|-L${LOCALBASE}/lib|g ; \
>-		 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}|' \
>-		`${FIND} ${WRKSRC} -type f -name Makefile`
>+	@${REINPLACE_CMD} -e 's|-ldl ||g' \
>+		${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \
>+		${WRKSRC}/configure2
> 
> .include <bsd.port.mk>
>diff -aurN multimedia/libdvdnav.orig/distinfo multimedia/libdvdnav/distinfo
>--- multimedia/libdvdnav.orig/distinfo	2006-01-22 21:19:38.000000000 +0000
>+++ multimedia/libdvdnav/distinfo	2009-02-10 19:17:12.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (libdvdnav-0.1.10.tar.gz) = c8ddee96ba1182d73447eaf0bb6fde81
>-SHA256 (libdvdnav-0.1.10.tar.gz) = c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0
>-SIZE (libdvdnav-0.1.10.tar.gz) = 539803
>+MD5 (libdvdnav-4.1.3.tar.bz2) = d62383c45b28816771e283515f2c27fa
>+SHA256 (libdvdnav-4.1.3.tar.bz2) = e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d
>+SIZE (libdvdnav-4.1.3.tar.bz2) = 110843
>diff -aurN multimedia/libdvdnav.orig/files/patch-Makefile multimedia/libdvdnav/files/patch-Makefile
>--- multimedia/libdvdnav.orig/files/patch-Makefile	1970-01-01 00:00:00.000000000 +0000
>+++ multimedia/libdvdnav/files/patch-Makefile	2009-02-10 19:17:12.000000000 +0000
>@@ -0,0 +1,16 @@
>+--- Makefile.orig	2008-10-04 12:25:15.145677557 +0200
>++++ Makefile	2008-10-04 12:36:23.806607647 +0200
>+@@ -131,10 +131,9 @@
>+ 	$(pcedit) $< > $@
>+ 
>+ install-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc
>+-	install -d $(DESTDIR)$(libdir)/pkgconfig
>+-	install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdir)/pkgconfig
>+-	install -m 0644 $(.OBJDIR)/dvdnavmini.pc \
>+-	  $(DESTDIR)$(libdir)/pkgconfig
>++	install -d $(DESTDIR)$(libdatadir)
>++	install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdatadir)
>++	install -m 0644 $(.OBJDIR)/dvdnavmini.pc $(DESTDIR)$(libdatadir)
>+ 
>+ distclean: clean
>+ 	find . -name "*~" | xargs rm -rf
>diff -aurN multimedia/libdvdnav.orig/files/patch-configure2 multimedia/libdvdnav/files/patch-configure2
>--- multimedia/libdvdnav.orig/files/patch-configure2	1970-01-01 00:00:00.000000000 +0000
>+++ multimedia/libdvdnav/files/patch-configure2	2009-02-10 19:17:12.000000000 +0000
>@@ -0,0 +1,35 @@
>+--- configure2.orig	2008-10-04 12:27:58.564694499 +0200
>++++ configure2	2008-10-04 12:35:04.406225755 +0200
>+@@ -26,6 +26,7 @@
>+   echo "  --help                   print this message"
>+   echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
>+   echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
>++  echo "  --libdatadir=DIR         install pkgconfig files in DIR [PREFIX/lib/pkgconfig]"
>+   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
>+   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/dvdnav]"
>+   echo "  --enable-static          build static libraries [default=yes]"
>+@@ -72,6 +73,8 @@
>+   ;;
>+   --libdir=*) libdir="$optval"
>+   ;;
>++  --libdatadir=*) libdatadir="$optval"
>++  ;;
>+   --shlibdir=*) shlibdir="$optval"
>+   ;;
>+   --incdir=*) incdir="$optval"
>+@@ -100,6 +103,7 @@
>+ PREFIX=`cd $PREFIX && pwd`
>+ 
>+ test -z "$libdir" && libdir=$PREFIX/lib
>++test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig
>+ test -z "$shlibdir" && shlibdir=$PREFIX/lib
>+ test -z "$incdir" && incdir=$PREFIX/include/dvdnav
>+ 
>+@@ -127,6 +131,7 @@
>+ # Automatically generated by configure, do not edit
>+ PREFIX=$PREFIX
>+ libdir=$libdir
>++libdatadir=$libdatadir
>+ shlibdir=$shlibdir
>+ incdir=$incdir
>+ THREADLIB=$threadlib
>diff -aurN multimedia/libdvdnav.orig/files/patch-example:Makefile.in multimedia/libdvdnav/files/patch-example:Makefile.in
>--- multimedia/libdvdnav.orig/files/patch-example:Makefile.in	2004-02-19 18:19:44.000000000 +0000
>+++ multimedia/libdvdnav/files/patch-example:Makefile.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,11 +0,0 @@
>---- examples/Makefile.in.orig	Tue May 20 23:20:12 2003
>-+++ examples/Makefile.in	Thu Feb 12 20:44:41 2004
>-@@ -151,7 +151,7 @@
>- noinst_PROGRAMS = menus
>- 
>- menus_SOURCES = menus.c
>--menus_LDFLAGS = -L$(top_srcdir)/src/
>-+menus_LDFLAGS = -L$(top_srcdir)/src/ $(THREAD_LIBS)
>- menus_LDADD = $(DVDNAV_LIB)
>- subdir = examples
>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>diff -aurN multimedia/libdvdnav.orig/files/patch-m4:Makefile.in multimedia/libdvdnav/files/patch-m4:Makefile.in
>--- multimedia/libdvdnav.orig/files/patch-m4:Makefile.in	2005-10-23 02:32:32.000000000 +0000
>+++ multimedia/libdvdnav/files/patch-m4:Makefile.in	1970-01-01 00:00:00.000000000 +0000
>@@ -1,12 +0,0 @@
>---- m4/Makefile.in.orig	Sun Oct 23 11:18:31 2005
>-+++ m4/Makefile.in	Sun Oct 23 11:19:02 2005
>-@@ -116,8 +116,7 @@
>- 
>- EXTRA_DIST = dvdnav.m4
>- 
>--@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@
>--@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
>-+m4datadir = $(datadir)/aclocal
>- 
>- m4data_DATA = dvdnav.m4
>- subdir = m4
>diff -aurN multimedia/libdvdnav.orig/files/patch-src:vm.c multimedia/libdvdnav/files/patch-src:vm.c
>--- multimedia/libdvdnav.orig/files/patch-src:vm.c	2005-10-08 14:09:03.000000000 +0000
>+++ multimedia/libdvdnav/files/patch-src:vm.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,13 +0,0 @@
>---- src/vm/vm.c.orig	Fri Feb 20 00:49:57 2004
>-+++ src/vm/vm.c	Fri Feb 20 00:54:31 2004
>-@@ -47,6 +47,10 @@
>- #define lseek64 lseek
>- #endif /* _MSC_VER */
>- 
>-+#ifdef __FreeBSD__
>-+#define lseek64 lseek
>-+#endif
>-+
>- /*
>- #define STRICT
>- */
>diff -aurN multimedia/libdvdnav.orig/pkg-descr multimedia/libdvdnav/pkg-descr
>--- multimedia/libdvdnav.orig/pkg-descr	2002-05-20 17:48:19.000000000 +0000
>+++ multimedia/libdvdnav/pkg-descr	2009-02-10 19:17:12.000000000 +0000
>@@ -1,6 +1,3 @@
>-The library for the xine-dvdnav plugin.
>+Mplayer version of the libdvdnav project.
> 
>-WWW: http://dvd.sourceforge.net/xine-dvdnav.shtml
>-
>---
>-MANTANI Nobutaka <nobutaka@nobutaka.com>
>+WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav
>diff -aurN multimedia/libdvdnav.orig/pkg-plist multimedia/libdvdnav/pkg-plist
>--- multimedia/libdvdnav.orig/pkg-plist	2006-02-23 10:38:08.000000000 +0000
>+++ multimedia/libdvdnav/pkg-plist	2009-02-10 19:17:12.000000000 +0000
>@@ -1,17 +1,14 @@
> bin/dvdnav-config
>-include/dvdnav/dvd_reader.h
> include/dvdnav/dvd_types.h
> include/dvdnav/dvdnav.h
> include/dvdnav/dvdnav_events.h
>-include/dvdnav/ifo_print.h
>-include/dvdnav/ifo_read.h
>-include/dvdnav/ifo_types.h
>-include/dvdnav/nav_print.h
>-include/dvdnav/nav_read.h
>-include/dvdnav/nav_types.h
>-lib/libdvdnav.a
>-lib/libdvdnav.la
>-lib/libdvdnav.so
>-lib/libdvdnav.so.4
>-share/aclocal/dvdnav.m4
> @dirrm include/dvdnav
>+lib/libdvdnav.so.4.1.3
>+lib/libdvdnav.so.4
>+lib/libdvdnav.so
>+lib/libdvdnav.a
>+lib/libdvdnavmini.so.4.1.3
>+lib/libdvdnavmini.so.4
>+lib/libdvdnavmini.so
>+libdata/pkgconfig/dvdnav.pc
>+libdata/pkgconfig/dvdnavmini.pc
>diff -aurN multimedia/lxdvdrip.orig/Makefile multimedia/lxdvdrip/Makefile
>--- multimedia/lxdvdrip.orig/Makefile	2010-08-29 16:18:56.669325919 +0000
>+++ multimedia/lxdvdrip/Makefile	2010-08-29 16:19:09.875655076 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	lxdvdrip
> PORTVERSION=	1.62
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	multimedia
> MASTER_SITES=	http://download.berlios.de/lxdvdrip/ \
> 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
>diff -aurN multimedia/mplayerxp.orig/Makefile multimedia/mplayerxp/Makefile
>--- multimedia/mplayerxp.orig/Makefile	2010-08-31 06:10:33.387837560 +0000
>+++ multimedia/mplayerxp/Makefile	2010-08-31 06:12:31.687001280 +0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	mplayerxp
> PORTVERSION=	0.7.2
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	multimedia audio
> MASTER_SITES=	SF
> 
>diff -aurN multimedia/mplayerxp.orig/files/patch-mplayerxp__configure multimedia/mplayerxp/files/patch-mplayerxp__configure
>--- multimedia/mplayerxp.orig/files/patch-mplayerxp__configure	2010-08-31 06:10:33.356831664 +0000
>+++ multimedia/mplayerxp/files/patch-mplayerxp__configure	2010-08-31 06:12:31.724019672 +0000
>@@ -1,5 +1,5 @@
>---- mplayerxp/configure.orig	2009-01-25 17:00:03.000000000 +0900
>-+++ mplayerxp/configure	2009-02-03 00:18:15.000000000 +0900
>+--- mplayerxp/configure.orig	2009-01-25 08:00:03.000000000 +0000
>++++ mplayerxp/configure	2009-09-29 16:05:01.545372105 +0000
> @@ -85,13 +85,11 @@
>    --enable-dga           build with DGA1 or DGA2 support [autodetect]
>    --enable-vesa          build with VESA support [autodetect]
>@@ -32,3 +32,12 @@
>  
>  # Note: the -lXxf86vm library is the VideoMode extension and though it's not
>  # needed for DGA, AFAIK every distribution packages together with DGA stuffs
>+@@ -906,7 +906,7 @@
>+ print_config USE_ config.h config.mak dvdread
>+ enabled libdvdread	&& _inputmodules="dvdread $_inputmodules" || _noinputmodules="dvdread $_noinputmodules"
>+ 
>+-enabled libdvdnav	&& require2 libdvdnav dvdnav/dvdnav.h dvdnav_set_PGC_positioning_flag -ldvdnav
>++enabled libdvdnav	&& require2 libdvdnav "sys/types.h dvdnav/dvdnav.h" dvdnav_set_PGC_positioning_flag -ldvdnav
>+ dvdnav=$libdvdnav
>+ print_config USE_ config.h config.mak dvdnav
>+ enabled libdvdnav	&& _inputmodules="dvdnav $_inputmodules" || _noinputmodules="dvdnav $_noinputmodules"
>diff -aurN multimedia/vlc.orig/Makefile multimedia/vlc/Makefile
>--- multimedia/vlc.orig/Makefile	2010-08-29 17:09:44.927154777 +0000
>+++ multimedia/vlc/Makefile	2010-08-29 17:09:59.668523722 +0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	vlc
> DISTVERSION=	1.1.3
>+PORTREVISION=	1
> PORTEPOCH=	3
> CATEGORIES=	multimedia audio ipv6 net www
> MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
>diff -aurN multimedia/totem.orig/Makefile multimedia/totem/Makefile
>--- multimedia/totem.orig/Makefile	2010-08-31 06:17:31.201574501 +0000
>+++ multimedia/totem/Makefile	2010-08-31 06:31:41.555491549 +0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	totem
> PORTVERSION=	2.30.2
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	multimedia gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>@@ -46,8 +46,6 @@
> GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
> 		totem.schemas
> 
>-WITHOUT_DVDNAV=	yes
>-
> OPTIONS=	LIRC "Enable lirc support" off \
> 		GALAGO "Enable Galago support" off \
> 		BROWSER_PLUGINS "Enable install plugins for gecko browser" on \
>@@ -115,10 +113,6 @@
> PLIST_SUB+=	BROWSER_PLUGINS="@comment "
> .endif
> 
>-.if defined(WITH_DVDNAV) && !defined(WITHOUT_DVDNAV)
>-LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
>-.endif
>-
> .if defined(WITH_DVD_DEVICE)
> DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
> .else

Actions: View | Diff

Attachments on bug 131969: 93937 | 93938 | 93939