Update to 0.9.7. This version now depends on glib/gtk 2.x

Reviewed by:	David Yeske <dyeske@yahoo.com>

4 files changed, 47 insertions, 11 deletions

diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 86ba3c46071a..fe542c8c140d 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,18 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	lioux@FreeBSD.org
 
 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool \
-		nasm:${PORTSDIR}/devel/nasm
+		nasm:${PORTSDIR}/devel/nasm \
+		pkg-config:${PORTSDIR}/devel/pkgconfig
+
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
-		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+		glib-2.0.0:${PORTSDIR}/devel/glib20 \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
 
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${DATADIR} \
 		--with-glib-prefix=${LOCALBASE} \
-		--with-gtk-prefix=${LOCALBASE} \
+		--with-gtk-prefix=${X11BASE} \
 		--program-transform-name=''
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
@@ -93,18 +96,22 @@ post-patch:
 		${REINPLACE_CMD} -e \
 		's|stdint\.h|inttypes.h|;s|malloc\.h|stdlib.h|'
 # replacing distfile's libs with ports' versions
-	@${REINPLACE_CMD} -E -e 's|(SUBDIRS.+)SDL|\1|' \
-		${WRKSRC}/lib/Makefile.in
+# CFLAGS safeness
 	@${REINPLACE_CMD} -E -e 's|lib/SDL/sdl-config|${SDL_CONFIG}|; \
 		s|^(SDL_LIBS=).+$$|\1"`${SDL_CONFIG} --libs`"|' \
 		${CONFIGURE_WRKSRC}/configure
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's|-I[^ ]+lib/SDL/include|-I${LOCALBASE}/include/SDL11|; \
+		s|-O[0-3]|-O|; \
 		s|\$$[^ ]+/lib/SDL/src/main/libSDLmain.a|${LOCALBASE}/lib/libSDLmain-1.1.a|'
 	@${REINPLACE_CMD} -E -e \
 		's!SDL_(AudioDelayMsec|HasAudioDelayMsec).*;$$!0;!' \
 		${WRKSRC}/player/src/audio_sdl.cpp
+# use libgnugetopt
+	@${REINPLACE_CMD} -E -e \
+		s'|(-lm)|\1 -lgnugetopt|' \
+		${WRKSRC}/util/iptv/Makefile.in
 
 post-configure:
 # disable GNU auto* tools
@@ -126,7 +133,7 @@ post-install:
 
 .if ${ARCH} != "i386"
 WITHOUT_MMX=	yes
-.else 
+.else
 . if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
 WITH_OPTIMIZED_BYTESWAP=yes
 . endif
@@ -144,6 +151,10 @@ CONFIGURE_ARGS+=	--enable-ipv6
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
+.endif
+
 pre-everything::
 .ifndef(WITHOUT_IPV6)
 	@${ECHO_MSG} '===> Define WITHOUT_IPV6 if you want to disable IPv6 support'
@@ -157,6 +168,10 @@ pre-everything::
 	@${ECHO_MSG} '===> routines. This works only in the i386 architecture, and'
 	@${ECHO_MSG} '===> only with 486 processors and above.'
 .endif
-
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} '===> You can enable additional compilation optimizations'
+	@${ECHO_MSG} '===> by defining WITH_OPTIMIZED_CFLAGS'
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index 5af3bc8de916..9d1f2891f7fd 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1 +1 @@
-MD5 (mpeg4ip-0.9.6.tar.gz) = 37067937e75d8d57f4fad16e1019c85d
+MD5 (mpeg4ip-0.9.7.tar.gz) = c83f50433eff04436e9e7c372e7c60c8
diff --git a/multimedia/mpeg4ip/files/patch-lib::Makefile.in b/multimedia/mpeg4ip/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..9b8473efa0f9
--- /dev/null
+++ b/multimedia/mpeg4ip/files/patch-lib::Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	Wed Jan  1 21:46:28 2003
++++ lib/Makefile.in	Wed Jan  1 21:47:39 2003
+@@ -106,7 +106,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp SDL xvid mpeg2t SDL_VisualC
++SUBDIRS = avi bitstream config_file fposrec gnu mp4 mp4v2 mp4av msg_queue rtp sdp xvid mpeg2t
+ subdir = lib
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index 888b90d132fa..b6902688d83e 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -2,6 +2,7 @@ bin/avi2raw
 bin/avidump
 bin/faac
 bin/gmp4player
+bin/iptv_prog
 bin/lboxcrop
 bin/mp4creator
 bin/mp4dump
@@ -9,6 +10,7 @@ bin/mp4encode
 bin/mp4extract
 bin/mp4info
 bin/mp4player
+bin/mp4trackdump
 bin/mp4venc
 bin/rgb2yuv
 bin/xvidenc
@@ -47,6 +49,14 @@ lib/mp4player_plugin/celp_plugin.a
 lib/mp4player_plugin/celp_plugin.la
 lib/mp4player_plugin/celp_plugin.so
 lib/mp4player_plugin/celp_plugin.so.0
+lib/mp4player_plugin/h261_plugin.a
+lib/mp4player_plugin/h261_plugin.la
+lib/mp4player_plugin/h261_plugin.so
+lib/mp4player_plugin/h261_plugin.so.0
+lib/mp4player_plugin/h261_rtp_plugin.a
+lib/mp4player_plugin/h261_rtp_plugin.la
+lib/mp4player_plugin/h261_rtp_plugin.so
+lib/mp4player_plugin/h261_rtp_plugin.so.0
 lib/mp4player_plugin/isma_rtp_plugin.a
 lib/mp4player_plugin/isma_rtp_plugin.la
 lib/mp4player_plugin/isma_rtp_plugin.so