From ac43e8a05bfc4278c5f66b714314561edaaa9f9d Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Wed, 13 Nov 2002 19:08:09 +0000 Subject: o Update to 0.9.6 o Use FreeBSD optimized byteswap routines if 4.7-RELEASE or later --- graphics/mpeg4ip/Makefile | 22 +++++++++++++--- graphics/mpeg4ip/distinfo | 2 +- .../files/extra-patch-include::mpeg4ip_byteswap.h | 29 +++++++++++++++++++++ .../files/patch-include::mpeg4ip_byteswap.h | 26 +++++++++++++++++++ .../files/patch-lib::xvid::bitstream::h263.h | 30 ++++++++++++++++++++++ graphics/mpeg4ip/pkg-plist | 4 +++ 6 files changed, 108 insertions(+), 5 deletions(-) create mode 100644 graphics/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h create mode 100644 graphics/mpeg4ip/files/patch-include::mpeg4ip_byteswap.h create mode 100644 graphics/mpeg4ip/files/patch-lib::xvid::bitstream::h263.h (limited to 'graphics') diff --git a/graphics/mpeg4ip/Makefile b/graphics/mpeg4ip/Makefile index fb542891ee45..fc3f8d8b38b8 100644 --- a/graphics/mpeg4ip/Makefile +++ b/graphics/mpeg4ip/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mpeg4ip -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.6 CATEGORIES= graphics audio ipv6 net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,7 +26,6 @@ CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-glib-prefix=${LOCALBASE} \ --with-gtk-prefix=${LOCALBASE} \ --program-transform-name='' -CONFIGURE_ENV= PATH=${WRKDIR}/auto-bin:$$PATH SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config @@ -126,6 +125,14 @@ post-install: .if ${ARCH} != "i386" WITHOUT_MMX= yes +.else +. if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mi486} == "i486") +WITH_OPTIMIZED_BYTESWAP=yes +. endif + +. if defined(WITH_OPTIMIZED_BYTESWAP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include::mpeg4ip_byteswap.h +. endif .endif .if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6) @@ -138,10 +145,17 @@ CONFIGURE_ARGS+= --disable-mmx pre-everything:: .ifndef(WITHOUT_IPV6) - @${ECHO_MSG} 'Define WITHOUT_IPV6 if you want to disable IPv6 support' + @${ECHO_MSG} '===> Define WITHOUT_IPV6 if you want to disable IPv6 support' .endif .ifndef(WITHOUT_MMX) - @${ECHO_MSG} 'Define WITHOUT_MMX if your system does not support MMX' + @${ECHO_MSG} '===> Define WITHOUT_MMX if your system does not support MMX' .endif +.ifndef(WITH_OPTIMIZED_BYTESWAP) + @${ECHO_MSG} + @${ECHO_MSG} '===> Define WITH_OPTIMIZED_BYTESWAP to use optimized byteswap' + @${ECHO_MSG} '===> routines. This works only in the i386 architecture, and' + @${ECHO_MSG} '===> only with 486 processors and above.' +.endif + .include diff --git a/graphics/mpeg4ip/distinfo b/graphics/mpeg4ip/distinfo index b8b5a70b6a46..5af3bc8de916 100644 --- a/graphics/mpeg4ip/distinfo +++ b/graphics/mpeg4ip/distinfo @@ -1 +1 @@ -MD5 (mpeg4ip-0.9.5.tar.gz) = 7a462376de24beea42f315e0b1dec5e2 +MD5 (mpeg4ip-0.9.6.tar.gz) = 37067937e75d8d57f4fad16e1019c85d diff --git a/graphics/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h b/graphics/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h new file mode 100644 index 000000000000..f15881e88c3e --- /dev/null +++ b/graphics/mpeg4ip/files/extra-patch-include::mpeg4ip_byteswap.h @@ -0,0 +1,29 @@ +--- 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 ++# 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 or any other such diff --git a/graphics/mpeg4ip/files/patch-include::mpeg4ip_byteswap.h b/graphics/mpeg4ip/files/patch-include::mpeg4ip_byteswap.h new file mode 100644 index 000000000000..b43547f8f560 --- /dev/null +++ b/graphics/mpeg4ip/files/patch-include::mpeg4ip_byteswap.h @@ -0,0 +1,26 @@ +--- include/mpeg4ip_byteswap.h.orig Wed Nov 13 16:44:43 2002 ++++ include/mpeg4ip_byteswap.h Wed Nov 13 16:44:47 2002 +@@ -26,2 +26,6 @@ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include ++#endif ++ + #if defined(WORDS_BIGENDIAN) +@@ -51,2 +55,16 @@ + #define B2N_64(x) x = swap64(x) ++ ++#elif defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++#include ++#define B2N_16(x) (be16toh(x)) ++#define B2N_32(x) (be32toh(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)) + diff --git a/graphics/mpeg4ip/files/patch-lib::xvid::bitstream::h263.h b/graphics/mpeg4ip/files/patch-lib::xvid::bitstream::h263.h new file mode 100644 index 000000000000..1ef1d92651ef --- /dev/null +++ b/graphics/mpeg4ip/files/patch-lib::xvid::bitstream::h263.h @@ -0,0 +1,30 @@ +--- lib/xvid/bitstream/h263.h.orig Wed Nov 13 16:53:29 2002 ++++ lib/xvid/bitstream/h263.h Wed Nov 13 16:55:31 2002 +@@ -25,6 +25,10 @@ + /* #define FFMPEG_VERSION_INT 0x000405 */ + /* #define FFMPEG_VERSION "0.4.5" */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include ++#endif ++ + #ifdef WIN32 + #define CONFIG_WIN32 + #endif +@@ -69,11 +73,16 @@ + #define DEBUG + #endif + ++#if defined(__FreeBSD__) && __FreeBSD_version >= 470000 ++#include ++#define be2me_32(x) (be32toh(x)) ++#else + // code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc. + #define bswap_32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) + #define be2me_32(x) bswap_32(x) ++#endif + + #define snprintf _snprintf + diff --git a/graphics/mpeg4ip/pkg-plist b/graphics/mpeg4ip/pkg-plist index 81585621b3a5..888b90d132fa 100644 --- a/graphics/mpeg4ip/pkg-plist +++ b/graphics/mpeg4ip/pkg-plist @@ -47,6 +47,10 @@ 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/isma_rtp_plugin.a +lib/mp4player_plugin/isma_rtp_plugin.la +lib/mp4player_plugin/isma_rtp_plugin.so +lib/mp4player_plugin/isma_rtp_plugin.so.0 lib/mp4player_plugin/mp3_plugin.a lib/mp4player_plugin/mp3_plugin.la lib/mp4player_plugin/mp3_plugin.so -- cgit v1.2.3