View | Details | Raw Unified | Return to bug 131969 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 131969