8 files changed, 21 insertions, 71 deletions

diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index 33a4fe8d5f1b..c96fd6e409ea 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/mp4v2/distinfo b/multimedia/mp4v2/distinfo
index 1d74783ec77e..57fe871ed403 100644
--- a/multimedia/mp4v2/distinfo
+++ b/multimedia/mp4v2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpeg4ip-1.4.1.tar.gz) = 68968c23c7e9d23cac11f15f3bcf7ede
-SHA256 (mpeg4ip-1.4.1.tar.gz) = 6c60d8a37edcbf9e140f9352fabf3bf87ebbc8d819d251c503dda8b46e62ab10
-SIZE (mpeg4ip-1.4.1.tar.gz) = 4791075
+MD5 (mpeg4ip-1.5.tar.gz) = 738d638fe82ab2ef37d347e9203c4bba
+SHA256 (mpeg4ip-1.5.tar.gz) = a537a1944c8cf5eeb8ec3af3b23ab79cd685d4462c9456c3aea091077da25f94
+SIZE (mpeg4ip-1.5.tar.gz) = 4825367
diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile
index 33a4fe8d5f1b..c96fd6e409ea 100644
--- a/multimedia/mpeg4ip-libmp4v2/Makefile
+++ b/multimedia/mpeg4ip-libmp4v2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/multimedia/mpeg4ip-libmp4v2/distinfo b/multimedia/mpeg4ip-libmp4v2/distinfo
index 1d74783ec77e..57fe871ed403 100644
--- a/multimedia/mpeg4ip-libmp4v2/distinfo
+++ b/multimedia/mpeg4ip-libmp4v2/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpeg4ip-1.4.1.tar.gz) = 68968c23c7e9d23cac11f15f3bcf7ede
-SHA256 (mpeg4ip-1.4.1.tar.gz) = 6c60d8a37edcbf9e140f9352fabf3bf87ebbc8d819d251c503dda8b46e62ab10
-SIZE (mpeg4ip-1.4.1.tar.gz) = 4791075
+MD5 (mpeg4ip-1.5.tar.gz) = 738d638fe82ab2ef37d347e9203c4bba
+SHA256 (mpeg4ip-1.5.tar.gz) = a537a1944c8cf5eeb8ec3af3b23ab79cd685d4462c9456c3aea091077da25f94
+SIZE (mpeg4ip-1.5.tar.gz) = 4825367
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 8dcee2759c70..2baaa25e3ee5 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mpeg4ip
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +15,7 @@ PKGNAMESUFFIX=	${PKG_NAME_SUFFIX}
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Standards-based system to encode, stream and play MPEG-4 audio/video
 
-BUILD_DEPENDS=	mpeg4ip-libmp4v2>=1.4:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+BUILD_DEPENDS=	mpeg4ip-libmp4v2>=1.5:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
 LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		faad.0:${PORTSDIR}/audio/faad \
 		mp3lame.0:${PORTSDIR}/audio/lame \
@@ -24,9 +23,8 @@ LIB_DEPENDS=	faac.0:${PORTSDIR}/audio/faac \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2	\
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		x264.47:${PORTSDIR}/multimedia/x264 \
-		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
-		mp4av.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
+		x264.47:${PORTSDIR}/multimedia/x264
+RUN_DEPENDS=	mpeg4ip-libmp4v2>=1.5:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
 
 USE_GNOME=	gtk20
 USE_SDL=	sdl
@@ -195,30 +193,10 @@ post-install:
 .endfor
 .endif
 
-###
-## Arch extensions detection
-###
-# i386 specifics
-.if ${ARCH} != "i386"
-WITHOUT_MMX=	yes
+.if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "mmx")
+WITH_MMX=yes
 .else
-.if ${OSVERSION} < 470000
-. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486")
-OPTIONS+=	OPTIMIZED_BYTESWAP "Enable optimized byteswap routines" On
-. else
-OPTIONS+=	OPTIMIZED_BYTESWAP "Enable optimized byteswap routines" Off
-. endif
-.endif
-
-. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "mmx")
-OPTIONS+=	MMX "Enable MMX Optimizations" On
-. else
-OPTIONS+=	MMX "Enable MMX Optimizations" Off
-. endif
-
-. if defined(WITH_OPTIMIZED_BYTESWAP)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include::mpeg4ip_byteswap.h
-. endif
+WITHOUT_MMX=yes
 .endif
 
 ###
diff --git a/multimedia/mpeg4ip/distinfo b/multimedia/mpeg4ip/distinfo
index 1d74783ec77e..57fe871ed403 100644
--- a/multimedia/mpeg4ip/distinfo
+++ b/multimedia/mpeg4ip/distinfo
@@ -1,3 +1,3 @@
-MD5 (mpeg4ip-1.4.1.tar.gz) = 68968c23c7e9d23cac11f15f3bcf7ede
-SHA256 (mpeg4ip-1.4.1.tar.gz) = 6c60d8a37edcbf9e140f9352fabf3bf87ebbc8d819d251c503dda8b46e62ab10
-SIZE (mpeg4ip-1.4.1.tar.gz) = 4791075
+MD5 (mpeg4ip-1.5.tar.gz) = 738d638fe82ab2ef37d347e9203c4bba
+SHA256 (mpeg4ip-1.5.tar.gz) = a537a1944c8cf5eeb8ec3af3b23ab79cd685d4462c9456c3aea091077da25f94
+SIZE (mpeg4ip-1.5.tar.gz) = 4825367
diff --git a/multimedia/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h b/multimedia/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h
deleted file mode 100644
index f15881e88c3e..000000000000
--- a/multimedia/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/mpeg4ip_byteswap.h.orig	Wed Nov 13 16:40:27 2002
-+++ include/mpeg4ip_byteswap.h	Wed Nov 13 16:42:01 2002
-@@ -50,6 +50,26 @@
- #define B2N_32(x) x = swap32(x)
- #define B2N_64(x) x = swap64(x)
- 
-+#elif defined(__FreeBSD__)
-+#  define _KERNEL
-+#  define I486_CPU	/* Will crash unless 486+ */
-+#  include <machine/endian.h>
-+#  undef _KERNEL
-+#  undef I486_CPU
-+#define B2N_16(x) \
-+ x = ((((x) & 0xff00) >> 8) | \
-+      (((x) & 0x00ff) << 8))
-+#define B2N_32(x) (ntohl(x))
-+#define B2N_64(x) \
-+ x = ((((x) & 0xff00000000000000) >> 56) | \
-+      (((x) & 0x00ff000000000000) >> 40) | \
-+      (((x) & 0x0000ff0000000000) >> 24) | \
-+      (((x) & 0x000000ff00000000) >>  8) | \
-+      (((x) & 0x00000000ff000000) <<  8) | \
-+      (((x) & 0x0000000000ff0000) << 24) | \
-+      (((x) & 0x000000000000ff00) << 40) | \
-+      (((x) & 0x00000000000000ff) << 56))
-+
- /* This is a slow but portable implementation, it has multiple evaluation 
-  * problems so beware.
-  * FreeBSD and Solaris don't have <byteswap.h> or any other such 
diff --git a/multimedia/mpeg4ip/pkg-plist b/multimedia/mpeg4ip/pkg-plist
index d72e92bf8108..1670ecdc791e 100644
--- a/multimedia/mpeg4ip/pkg-plist
+++ b/multimedia/mpeg4ip/pkg-plist
@@ -66,6 +66,9 @@ lib/libmsg_queue.so.0
 lib/libsdp.la
 lib/libsdp.so
 lib/libsdp.so.0
+lib/libsrtpif.la
+lib/libsrtpif.so
+lib/libsrtpif.so.0
 lib/mp4player_plugin/a52_audio_plugin.la
 lib/mp4player_plugin/a52_audio_plugin.so
 lib/mp4player_plugin/a52_audio_plugin.so.0