Attachment #141042 for bug #187759





PORTNAME=	gmerlin
PORTVERSION=	1.2.0
PORTREVISION=	1
CATEGORIES=	multimedia
MASTER_SITES=	SF


COMMENT=	Multimedia framework

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
		libgavl.so:${PORTSDIR}/multimedia/gavl \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig

USES=		gettext pathfix pkgconfig
		OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME \
		TIFF
OPTIONS_DEFAULT=	CDDB CDIO JACK JPEG LIBVISUAL \
		OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME \
		TIFF

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-v4l --disable-v4l2 --disable-v4lconvert \
		--without-doxygen --with-cpuflags=none --disable-musicbrainz
USES=		pathfix gettext pkgconfig
USE_GNOME=	gtk20 libxml2
USE_XORG=	x11 xext xfixes xinerama xv
USE_GL=		gl
USE_SQLITE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	ac_cv_func_inotify_init=no
CONFIGURE_ARGS=	--disable-v4l --disable-v4l2 --disable-v4lconvert \
		--without-doxygen --with-cpuflags=none --disable-musicbrainz
USE_LDCONFIG=	yes
INSTALL_ICONS=	yes


LDFLAGS+=	-L${LOCALBASE}/lib

INFO=		gmerlin

OPTIONS_DEFINE= 	ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \
			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
OPTIONS_DEFAULT=	CDDB CDIO JACK JPEG LIBVISUAL \
			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
OPTIONS_SUB=		yes

ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
ALSA_CONFIGURE_OFF=	--disable-alsa --disable-alsamixer
CDDB_LIB_DEPENDS=	libcddb.so:${PORTSDIR}/audio/libcddb
CDDB_CONFIGURE_ARGS=	--disable-cddb
CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
CDIO_CONFIGURE_OFF=	--disable-libcdio
ESOUND_USE=		gnome=esound
ESOUND_CONFIGURE_OFF=	--disable-esd
JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
JACK_CONFIGURE_OFF=	--disable-jack
JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
JPEG_CONFIGURE_OFF=	--disable-libjpeg
LIBVISUAL_LIB_DEPENDS=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
LIBVISUAL_CONFIGURE_OFF=--disable-libvisual
OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops -fomit-frame-pointer -ffast-math
PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
PNG_CONFIGURE_OFF=	--disable-libpng
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_CONFIGURE_OFF=--disable-pulseaudio
QUICKTIME_LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
QUICKTIME_CONFIGURE_OFF=--disable-lqt
TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
TIFF_CONFIGURE_OFF=	--disable-libtiff
CONFIGURE_ARGS+=--disable-lqt
PLIST_SUB+=	QUICKTIME="@comment "
.endif

.if ${PORT_OPTIONS:MLIBVISUAL}
LIB_DEPENDS+=	visual-0.4:${PORTSDIR}/graphics/libvisual04
.else
CONFIGURE_ARGS+=--disable-libvisual
.endif

.if ${PORT_OPTIONS:MCDIO}
LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
PLIST_SUB+=	CDIO=""
.else
CONFIGURE_ARGS+=--disable-libcdio
PLIST_SUB+=	CDIO="@comment "
.endif

.if ${PORT_OPTIONS:MCDDB}
LIB_DEPENDS+=	cddb.4:${PORTSDIR}/audio/libcddb
.else
CONFIGURE_ARGS+=--disable-cddb
.endif

.if ${PORT_OPTIONS:MESOUND}
LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
PLIST_SUB+=	ESOUND=""
.else
CONFIGURE_ARGS+=--disable-esd
PLIST_SUB+=	ESOUND="@comment "
.endif

.if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
PLIST_SUB+=	JACK=""
.else
CONFIGURE_ARGS+=--disable-jack
PLIST_SUB+=	JACK="@comment "
.endif

.if ${PORT_OPTIONS:MJPEG}
LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
PLIST_SUB+=	JPEG=""
.else
CONFIGURE_ARGS+=--disable-libjpeg
PLIST_SUB+=	JPEG="@comment "
.endif

.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
PLIST_SUB+=	PNG=""
.else
CONFIGURE_ARGS+=--disable-libpng
PLIST_SUB+=	PNG="@comment "
.endif

.if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
PLIST_SUB+=	TIFF=""
.else
CONFIGURE_ARGS+=--disable-libtiff
PLIST_SUB+=	TIFF="@comment "
.endif

# applications
.if ${PORT_OPTIONS:MALSA}
PLIST_SUB+=	ALSAMIXER=""
.else
CONFIGURE_ARGS+=--disable-alsamixer
PLIST_SUB+=	ALSAMIXER="@comment "
.endif

# vendor ocflags from configure
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+=	-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math
CXXFLAGS+=	-O3 -funroll-all-loops -fomit-frame-pointer -ffast-math
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/LIBS/s|-ldl || ; \
		 s|^LDFLAGS="|&$${LDFLAGS} | ; \
		 s|-DGTK_DISABLE_DEPRECATED|| ; \
		 s|-lpthread|-pthread| ; \
		 s|-O3.*-ffast-math||' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|^texinfo_|#texinfo_|g' ${WRKSRC}/doc/Makefile.in
		 s|-lpthread|${PTHREAD_LIBS}|g ; \
		 /^LIBS = / s|$$| @LIBINTL@ ${PTHREAD_LIBS}|g' \
		${WRKSRC}/lib/Makefile.am ${WRKSRC}/lib/Makefile.in \
		${WRKSRC}/tests/Makefile.am ${WRKSRC}/tests/Makefile.in \
		${WRKSRC}/apps/*/Makefile.am ${WRKSRC}/apps/*/Makefile.in
	@${REINPLACE_CMD} -e \
		's|ln -sf $$(DESTDIR)|ln -sf |' ${WRKSRC}/icons/Makefile.in
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|-ldl||g ; \
		 s|-lpthread|-pthread|g ; \
		 /^LIBS = /s|$$| @LIBINTL@ -pthread|g'

post-install:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif

.include <bsd.port.mk>




--- configure.orig	2014-03-18 03:42:33.000000000 +0900
+++ configure	2014-03-18 03:57:27.000000000 +0900
@@ -1048,6 +1048,7 @@
 with_x
 enable_pulseaudio
 enable_lqt

 enable_libvisual
 enable_libcdio
 enable_musicbrainz
@@ -6324,7 +6325,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+amd64-*freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -6336,7 +6337,7 @@
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
-	  x86_64-*kfreebsd*-gnu)
+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
@@ -6355,7 +6356,7 @@
 	;;
       *64-bit*)
 	case $host in
-	  x86_64-*kfreebsd*-gnu)
+	  amd64-*freebsd*|x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_x86_64_fbsd"
 	    ;;
 	  x86_64-*linux*)
@@ -11240,7 +11241,7 @@
 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
 	 if test -n "$ac_prev"; then
 	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
+	     amd64 | i?86 | x86_64 | ppc | ppc64)
 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
 		 ac_arch=$ac_word
 	       else
@@ -15396,9 +15397,9 @@
 V4LCONVERT_REQUIRED="0.5.7"
 have_v4lconvert=false
 

                  yes) test_v4lconvert=true ;;
                  no) test_v4lconvert=false ;;
                esac
@@ -17345,7 +17346,7 @@
 case $host_cpu in
   i[3-7]86)
     lqt_cpu_family=x86;;
-  x86_64*)
+  amd64* | x86_64*)
     lqt_cpu_family=x86;;
   powerpc | powerpc64)
     lqt_cpu_family=ppc;;
@@ -17520,7 +17521,7 @@
 $as_echo "IA32" >&6; }
     ARCH_X86=true
     ;;
-  x86_64*)
+  amd64* | x86_64*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: x86_64" >&5
 $as_echo "x86_64" >&6; }
     ARCH_X86=true

Line 0 Link Here

(-)multimedia/gmerlin/files/patch-plugins__videofilters__bgyadif.c (+11 lines)
	1	--- plugins/videofilters/bgyadif.c.orig
	2	+++ plugins/videofilters/bgyadif.c
	3	@@ -704,7 +704,7 @@
	4	\
	5	/* if(p->mode<2) ... */\
	6	"movq %[tmp3], %%mm6 \n\t" /* diff */\
	7	- "cmp $2, %[mode] \n\t"\
	8	+ "cmpl $2, %[mode] \n\t"\
	9	"jge 1f \n\t"\
	10	LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2refs] /\
	11	LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2refs] /\




bin/album2m3u
bin/album2pls
bin/gmerlin
bin/gmerlin-record
bin/gmerlin-video-thumbnailer
%%ALSA%%bin/gmerlin_alsamixer
bin/gmerlin_imgconvert
bin/gmerlin_imgdiff
bin/gmerlin_kbd

bin/gmerlin_play
bin/gmerlin_plugincfg
bin/gmerlin_psnr
bin/gmerlin-record
bin/gmerlin_recorder
bin/gmerlin_remote
bin/gmerlin_ssim

lib/libgmerlin_gtk.so.0
libdata/pkgconfig/gmerlin-gtk.pc
libdata/pkgconfig/gmerlin.pc
man/man1/gmerlin-record.1.gz
man/man1/gmerlin.1.gz
man/man1/gmerlin_play.1.gz
man/man1/gmerlin_remote.1.gz
man/man1/gmerlin_transcoder.1.gz
man/man1/gmerlin_transcoder_remote.1.gz
%%ALSA%%share/applications/gmerlin-alsamixer.desktop
share/applications/gmerlin-kbd.desktop
share/applications/gmerlin-player.desktop
share/applications/gmerlin-plugincfg.desktop

Return to bug 187759

Lines 3-8 Link Here

(-)multimedia/gmerlin/Makefile (-137 / +54 lines)
3		3
4	PORTNAME= gmerlin	4	PORTNAME= gmerlin
5	PORTVERSION= 1.2.0	5	PORTVERSION= 1.2.0
		6	PORTREVISION= 1
6	CATEGORIES= multimedia	7	CATEGORIES= multimedia
7	MASTER_SITES= SF	8	MASTER_SITES= SF
8		9
Lines 10-34 Link Here
10	COMMENT= Multimedia framework	11	COMMENT= Multimedia framework
11		12
12	LICENSE= GPLv3	13	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \	15	LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
16	gavl.1:${PORTSDIR}/multimedia/gavl	16	libgavl.so:${PORTSDIR}/multimedia/gavl \
		17	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
17		18
18	OPTIONS_DEFINE= ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \	19	USES= gettext pathfix pkgconfig
19	OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME \
20	TIFF
21	OPTIONS_DEFAULT= CDDB CDIO JACK JPEG LIBVISUAL \
22	OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME \
23	TIFF
24
25	GNU_CONFIGURE= yes
26	CONFIGURE_ARGS= --disable-v4l --disable-v4l2 --disable-v4lconvert \
27	--without-doxygen --with-cpuflags=none --disable-musicbrainz
28	USES= pathfix gettext pkgconfig
29	USE_GNOME= gtk20 libxml2	20	USE_GNOME= gtk20 libxml2
30	USE_XORG= x11 xext xfixes xinerama xv	21	USE_XORG= x11 xext xfixes xinerama xv
31	USE_GL= gl	22	USE_GL= gl
		23	USE_SQLITE= yes
		24	GNU_CONFIGURE= yes
		25	CONFIGURE_ENV= ac_cv_func_inotify_init=no
		26	CONFIGURE_ARGS= --disable-v4l --disable-v4l2 --disable-v4lconvert \
		27	--without-doxygen --with-cpuflags=none --disable-musicbrainz
32	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
33	INSTALL_ICONS= yes	29	INSTALL_ICONS= yes
34		30
Lines 36-169 Link Here
36	LDFLAGS+= -L${LOCALBASE}/lib	32	LDFLAGS+= -L${LOCALBASE}/lib
37		33
38	INFO= gmerlin	34	INFO= gmerlin
39	MAN1= gmerlin.1 \	35
40	gmerlin_play.1 \	36	OPTIONS_DEFINE= ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \
41	gmerlin_remote.1 \	37	OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
42	gmerlin_transcoder.1 \	38	OPTIONS_DEFAULT= CDDB CDIO JACK JPEG LIBVISUAL \
43	gmerlin_transcoder_remote.1 \	39	OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
44	gmerlin-record.1	40	OPTIONS_SUB= yes
45		41
46	NO_STAGE= yes	42	ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
47	.include <bsd.port.pre.mk>	43	ALSA_CONFIGURE_OFF= --disable-alsa --disable-alsamixer
48		44	CDDB_LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb
49	.if ${PORT_OPTIONS:MALSA}	45	CDDB_CONFIGURE_ARGS= --disable-cddb
50	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib	46	CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
51	PLIST_SUB+= ALSA=""	47	CDIO_CONFIGURE_OFF= --disable-libcdio
52	.else	48	ESOUND_USE= gnome=esound
53	CONFIGURE_ARGS+=--disable-alsa	49	ESOUND_CONFIGURE_OFF= --disable-esd
54	PLIST_SUB+= ALSA="@comment "	50	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
55	.endif	51	JACK_CONFIGURE_OFF= --disable-jack
56		52	JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
57	.if ${PORT_OPTIONS:MPULSEAUDIO}	53	JPEG_CONFIGURE_OFF= --disable-libjpeg
58	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio	54	LIBVISUAL_LIB_DEPENDS= libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
59	PLIST_SUB+= PULSEAUDIO=""	55	LIBVISUAL_CONFIGURE_OFF=--disable-libvisual
60	.else	56	OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops -fomit-frame-pointer -ffast-math
61	CONFIGURE_ARGS+=--disable-pulseaudio	57	PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
62	PLIST_SUB+= PULSEAUDIO="@comment "	58	PNG_CONFIGURE_OFF= --disable-libpng
63	.endif	59	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
64		60	PULSEAUDIO_CONFIGURE_OFF=--disable-pulseaudio
65	.if ${PORT_OPTIONS:MQUICKTIME}	61	QUICKTIME_LIB_DEPENDS= libquicktime.so:${PORTSDIR}/multimedia/libquicktime
66	LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime	62	QUICKTIME_CONFIGURE_OFF=--disable-lqt
67	PLIST_SUB+= QUICKTIME=""	63	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff
68	.else	64	TIFF_CONFIGURE_OFF= --disable-libtiff
69	CONFIGURE_ARGS+=--disable-lqt
70	PLIST_SUB+= QUICKTIME="@comment "
71	.endif
72
73	.if ${PORT_OPTIONS:MLIBVISUAL}
74	LIB_DEPENDS+= visual-0.4:${PORTSDIR}/graphics/libvisual04
75	.else
76	CONFIGURE_ARGS+=--disable-libvisual
77	.endif
78
79	.if ${PORT_OPTIONS:MCDIO}
80	LIB_DEPENDS+= cdio.13:${PORTSDIR}/sysutils/libcdio
81	PLIST_SUB+= CDIO=""
82	.else
83	CONFIGURE_ARGS+=--disable-libcdio
84	PLIST_SUB+= CDIO="@comment "
85	.endif
86
87	.if ${PORT_OPTIONS:MCDDB}
88	LIB_DEPENDS+= cddb.4:${PORTSDIR}/audio/libcddb
89	.else
90	CONFIGURE_ARGS+=--disable-cddb
91	.endif
92
93	.if ${PORT_OPTIONS:MESOUND}
94	LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound
95	PLIST_SUB+= ESOUND=""
96	.else
97	CONFIGURE_ARGS+=--disable-esd
98	PLIST_SUB+= ESOUND="@comment "
99	.endif
100
101	.if ${PORT_OPTIONS:MJACK}
102	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
103	PLIST_SUB+= JACK=""
104	.else
105	CONFIGURE_ARGS+=--disable-jack
106	PLIST_SUB+= JACK="@comment "
107	.endif
108
109	.if ${PORT_OPTIONS:MJPEG}
110	LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
111	PLIST_SUB+= JPEG=""
112	.else
113	CONFIGURE_ARGS+=--disable-libjpeg
114	PLIST_SUB+= JPEG="@comment "
115	.endif
116
117	.if ${PORT_OPTIONS:MPNG}
118	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
119	PLIST_SUB+= PNG=""
120	.else
121	CONFIGURE_ARGS+=--disable-libpng
122	PLIST_SUB+= PNG="@comment "
123	.endif
124
125	.if ${PORT_OPTIONS:MTIFF}
126	LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
127	PLIST_SUB+= TIFF=""
128	.else
129	CONFIGURE_ARGS+=--disable-libtiff
130	PLIST_SUB+= TIFF="@comment "
131	.endif
132
133	# applications
134	.if ${PORT_OPTIONS:MALSA}
135	PLIST_SUB+= ALSAMIXER=""
136	.else
137	CONFIGURE_ARGS+=--disable-alsamixer
138	PLIST_SUB+= ALSAMIXER="@comment "
139	.endif
140
141	# vendor ocflags from configure
142	.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
143	CFLAGS+= -O3 -funroll-all-loops -fomit-frame-pointer -ffast-math
144	CXXFLAGS+= -O3 -funroll-all-loops -fomit-frame-pointer -ffast-math
145	.endif
146		65
147	post-patch:	66	post-patch:
148	@${REINPLACE_CMD} -e \	67	@${REINPLACE_CMD} -e \
149	's\|-O3.*-ffast-math\|\|g ; \	68	'/LIBS/s\|-ldl \|\| ; \
150	s\|-DGTK_DISABLE_DEPRECATED\|\|g ; \	69	s\|^LDFLAGS="\|&$${LDFLAGS} \| ; \
151	/LIBS/ s\|-ldl\|\|g ; \	70	s\|-DGTK_DISABLE_DEPRECATED\|\| ; \
152	s\|^LDFLAGS="\|&$${LDFLAGS} \|g' ${WRKSRC}/configure	71	s\|-lpthread\|-pthread\| ; \
		72	s\|-O3.*-ffast-math\|\|' ${WRKSRC}/configure
153	@${REINPLACE_CMD} -e \	73	@${REINPLACE_CMD} -e \
154	's\|-ldl\|\|g ; \	74	's\|^texinfo_\|#texinfo_\|g' ${WRKSRC}/doc/Makefile.in
155	s\|-lpthread\|${PTHREAD_LIBS}\|g ; \
156	/^LIBS = / s\|$$\| @LIBINTL@ ${PTHREAD_LIBS}\|g' \
157	${WRKSRC}/lib/Makefile.am ${WRKSRC}/lib/Makefile.in \
158	${WRKSRC}/tests/Makefile.am ${WRKSRC}/tests/Makefile.in \
159	${WRKSRC}/apps//Makefile.am ${WRKSRC}/apps//Makefile.in
160	@${REINPLACE_CMD} -e \	75	@${REINPLACE_CMD} -e \
161	's\|^texinfo_\|#texinfo_\|g' ${WRKSRC}/doc/Makefile.in	76	's\|ln -sf $$(DESTDIR)\|ln -sf \|' ${WRKSRC}/icons/Makefile.in
		77	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
		78	's\|-ldl\|\|g ; \
		79	s\|-lpthread\|-pthread\|g ; \
		80	/^LIBS = /s\|$$\| @LIBINTL@ -pthread\|g'
162		81
163	post-install:	82	post-install:
164	.if ${PORT_OPTIONS:MDOCS}	83	@${MKDIR} ${STAGEDIR}${DOCSDIR}
165	@${MKDIR} ${DOCSDIR}	84	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
166	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
167	.endif
168		85
169	.include <bsd.port.post.mk>	86	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)multimedia/gmerlin/files/patch-configure (-4 / +58 lines)
1	--- configure.orig 2011-01-08 09:50:08.000000000 +0900	1	--- configure.orig 2014-03-18 03:42:33.000000000 +0900
2	+++ configure 2011-06-29 01:06:34.000000000 +0900	2	+++ configure 2014-03-18 03:57:27.000000000 +0900
3	@@ -1042,6 +1042,7 @@	3	@@ -1048,6 +1048,7 @@
4	with_x	4	with_x
5	enable_pulseaudio	5	enable_pulseaudio
6	enable_lqt	6	enable_lqt
Lines 8-14 Link Here
8	enable_libvisual	8	enable_libvisual
9	enable_libcdio	9	enable_libcdio
10	enable_musicbrainz	10	enable_musicbrainz
11	@@ -15115,9 +15116,9 @@	11	@@ -6324,7 +6325,7 @@
		12	rm -rf conftest*
		13	;;
		14
		15	-x86_64-kfreebsd-gnu\|x86_64-linux\|ppc-linux\|powerpc-linux\| \
		16	+amd64-freebsd\|x86_64-kfreebsd-gnu\|x86_64-linux\|ppc-linux\|powerpc-linux\| \
		17	s390-linux\|s390-tpf\|sparc-linux*)
		18	# Find out which ABI we are using.
		19	echo 'int i;' > conftest.$ac_ext
		20	@@ -6336,7 +6337,7 @@
		21	case `/usr/bin/file conftest.o` in
		22	32-bit)
		23	case $host in
		24	- x86_64-kfreebsd-gnu)
		25	+ amd64-freebsd\|x86_64-kfreebsd-gnu)
		26	LD="${LD-ld} -m elf_i386_fbsd"
		27	;;
		28	x86_64-linux)
		29	@@ -6355,7 +6356,7 @@
		30	;;
		31	64-bit)
		32	case $host in
		33	- x86_64-kfreebsd-gnu)
		34	+ amd64-freebsd\|x86_64-kfreebsd-gnu)
		35	LD="${LD-ld} -m elf_x86_64_fbsd"
		36	;;
		37	x86_64-linux)
		38	@@ -11240,7 +11241,7 @@
		39	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
		40	if test -n "$ac_prev"; then
		41	case $ac_word in
		42	- i?86 \| x86_64 \| ppc \| ppc64)
		43	+ amd64 \| i?86 \| x86_64 \| ppc \| ppc64)
		44	if test -z "$ac_arch" \|\| test "$ac_arch" = "$ac_word"; then
		45	ac_arch=$ac_word
		46	else
		47	@@ -15396,9 +15397,9 @@
12	V4LCONVERT_REQUIRED="0.5.7"	48	V4LCONVERT_REQUIRED="0.5.7"
13	have_v4lconvert=false	49	have_v4lconvert=false
14		50
Lines 21-23 Link Here
21	yes) test_v4lconvert=true ;;	57	yes) test_v4lconvert=true ;;
22	no) test_v4lconvert=false ;;	58	no) test_v4lconvert=false ;;
23	esac	59	esac
		60	@@ -17345,7 +17346,7 @@
		61	case $host_cpu in
		62	i[3-7]86)
		63	lqt_cpu_family=x86;;
		64	- x86_64*)
		65	+ amd64* \| x86_64*)
		66	lqt_cpu_family=x86;;
		67	powerpc \| powerpc64)
		68	lqt_cpu_family=ppc;;
		69	@@ -17520,7 +17521,7 @@
		70	$as_echo "IA32" >&6; }
		71	ARCH_X86=true
		72	;;
		73	- x86_64*)
		74	+ amd64* \| x86_64*)
		75	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: x86_64" >&5
		76	$as_echo "x86_64" >&6; }
		77	ARCH_X86=true

Lines 1-8 Link Here

(-)multimedia/gmerlin/pkg-plist (-3 / +9 lines)
1	bin/album2m3u	1	bin/album2m3u
2	bin/album2pls	2	bin/album2pls
3	bin/gmerlin	3	bin/gmerlin
		4	bin/gmerlin-record
4	bin/gmerlin-video-thumbnailer	5	bin/gmerlin-video-thumbnailer
5	%%ALSAMIXER%%bin/gmerlin_alsamixer	6	%%ALSA%%bin/gmerlin_alsamixer
6	bin/gmerlin_imgconvert	7	bin/gmerlin_imgconvert
7	bin/gmerlin_imgdiff	8	bin/gmerlin_imgdiff
8	bin/gmerlin_kbd	9	bin/gmerlin_kbd
Lines 11-17 Link Here
11	bin/gmerlin_play	12	bin/gmerlin_play
12	bin/gmerlin_plugincfg	13	bin/gmerlin_plugincfg
13	bin/gmerlin_psnr	14	bin/gmerlin_psnr
14	bin/gmerlin-record
15	bin/gmerlin_recorder	15	bin/gmerlin_recorder
16	bin/gmerlin_remote	16	bin/gmerlin_remote
17	bin/gmerlin_ssim	17	bin/gmerlin_ssim
Lines 221-227 Link Here
221	lib/libgmerlin_gtk.so.0	221	lib/libgmerlin_gtk.so.0
222	libdata/pkgconfig/gmerlin-gtk.pc	222	libdata/pkgconfig/gmerlin-gtk.pc
223	libdata/pkgconfig/gmerlin.pc	223	libdata/pkgconfig/gmerlin.pc
224	%%ALSAMIXER%%share/applications/gmerlin-alsamixer.desktop	224	man/man1/gmerlin-record.1.gz
		225	man/man1/gmerlin.1.gz
		226	man/man1/gmerlin_play.1.gz
		227	man/man1/gmerlin_remote.1.gz
		228	man/man1/gmerlin_transcoder.1.gz
		229	man/man1/gmerlin_transcoder_remote.1.gz
		230	%%ALSA%%share/applications/gmerlin-alsamixer.desktop
225	share/applications/gmerlin-kbd.desktop	231	share/applications/gmerlin-kbd.desktop
226	share/applications/gmerlin-player.desktop	232	share/applications/gmerlin-player.desktop
227	share/applications/gmerlin-plugincfg.desktop	233	share/applications/gmerlin-plugincfg.desktop