diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index facc242e47ee..cf84152b05c1 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,97 +1,97 @@ # New ports collection makefile for: x264 # Date created: 2005-01-11 # Whom: Michael Johnson # # $FreeBSD$ # $Id: Makefile 12 2006-09-30 06:25:13Z buhnux $ PORTNAME= x264 PORTVERSION= 0.0.20060926 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 MAINTAINER= multimedia@FreeBSD.org COMMENT= Multimedia library and tool for encoding H.264/AVC video streams WANT_GNOME= yes USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn USE_GETOPT_LONG=yes WRKSRC= ${WRKDIR}/${DISTNAME} USE_GMAKE= yes ALL_TARGET= default USE_LDCONFIG= yes HAS_CONFIGURE= yes OPTIONS= GPAC "Enable MPEG-4 Output" On \ GTK2 "Enable GTK2+ Frontend" On \ DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \ X11_OUTPUT "Enable X11 Output" Off CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ --enable-shared .include .if !defined(WITHOUT_GTK2) || ${HAVE_GNOME:Mgtk20}!="" USE_GETTEXT= yes USE_GNOME= gtk20 CONFIGURE_ARGS+= --enable-gtk PLIST_SUB+= GTK="" .else PLIST_SUB+= GTK="@comment " .endif .if ${OSVERSION} < 500000 WITHOUT_GPAC= yes .endif .if ${ARCH}=="i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif .if ${ARCH}=="amd64" || ${ARCH}=="sparc64" BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif MAKE_ARGS+= ARCH=${ARCH} .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 -funroll-loops -ffast-math .endif .if !defined(WITHOUT_GPAC) BUILD_DEPENDS+= gpac-libgpac>=0.4.0.r2,1:${PORTSDIR}/multimedia/gpac-libgpac LIB_DEPENDS+= gpac.1:${PORTSDIR}/multimedia/gpac-libgpac CONFIGURE_ARGS+= --enable-mp4-output .endif .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize USE_XLIB= yes .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile \ ${WRKSRC}/*/Makefile pre-install: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/x264.pc .include diff --git a/multimedia/x264-devel/files/patch-encoder_ratecontrol.c b/multimedia/x264-devel/files/patch-encoder_ratecontrol.c deleted file mode 100644 index 7e10b7b28297..000000000000 --- a/multimedia/x264-devel/files/patch-encoder_ratecontrol.c +++ /dev/null @@ -1,13 +0,0 @@ ---- encoder/ratecontrol.c.orig Thu May 11 13:35:36 2006 -+++ encoder/ratecontrol.c Thu May 11 13:36:57 2006 -@@ -38,6 +38,9 @@ - #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) - #define exp2f(x) powf( 2, (x) ) - #endif -+#if defined(__FreeBSD__) && (__FreeBSD__ < 5) -+#define isfinite(val) (!isnan((val)) && !isinf((val))) -+#endif - #if defined(SYS_MACOSX) - #define exp2f(x) (float)pow( 2, (x) ) - #define sqrtf sqrt - diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist index 8485966a9280..52b74f4877ca 100644 --- a/multimedia/x264-devel/pkg-plist +++ b/multimedia/x264-devel/pkg-plist @@ -1,16 +1,16 @@ bin/x264 %%GTK%%bin/x264_gtk_encode include/x264.h -%%GTK%%binclude/x264_gtk.h -%%GTK%%binclude/x264_gtk_enum.h +%%GTK%%include/x264_gtk.h +%%GTK%%include/x264_gtk_enum.h lib/libx264.a lib/libx264.so lib/libx264.so.50 -%%GTK%%blib/libx264gtk.a -%%GTK%%blib/libx264gtk.so -%%GTK%%blib/libx264gtk.so.50 +%%GTK%%lib/libx264gtk.a +%%GTK%%lib/libx264gtk.so +%%GTK%%lib/libx264gtk.so.50 libdata/pkgconfig/x264.pc -%%GTK%%blibdata/pkgconfig/x264gtk.pc -%%GTK%%bshare/locale/fr/LC_MESSAGES/x264_gtk.mo -%%GTK%%b%%DATADIR%%/x264.png -%%GTK%%b@dirrm %%DATADIR%% +%%GTK%%libdata/pkgconfig/x264gtk.pc +%%GTK%%share/locale/fr/LC_MESSAGES/x264_gtk.mo +%%GTK%%%%DATADIR%%/x264.png +%%GTK%%@dirrm %%DATADIR%% diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index facc242e47ee..cf84152b05c1 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -1,97 +1,97 @@ # New ports collection makefile for: x264 # Date created: 2005-01-11 # Whom: Michael Johnson # # $FreeBSD$ # $Id: Makefile 12 2006-09-30 06:25:13Z buhnux $ PORTNAME= x264 PORTVERSION= 0.0.20060926 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245 MAINTAINER= multimedia@FreeBSD.org COMMENT= Multimedia library and tool for encoding H.264/AVC video streams WANT_GNOME= yes USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn USE_GETOPT_LONG=yes WRKSRC= ${WRKDIR}/${DISTNAME} USE_GMAKE= yes ALL_TARGET= default USE_LDCONFIG= yes HAS_CONFIGURE= yes OPTIONS= GPAC "Enable MPEG-4 Output" On \ GTK2 "Enable GTK2+ Frontend" On \ DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \ X11_OUTPUT "Enable X11 Output" Off CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ --enable-shared .include .if !defined(WITHOUT_GTK2) || ${HAVE_GNOME:Mgtk20}!="" USE_GETTEXT= yes USE_GNOME= gtk20 CONFIGURE_ARGS+= --enable-gtk PLIST_SUB+= GTK="" .else PLIST_SUB+= GTK="@comment " .endif .if ${OSVERSION} < 500000 WITHOUT_GPAC= yes .endif .if ${ARCH}=="i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= ARCH_X86="1" .endif .if ${ARCH}=="amd64" || ${ARCH}=="sparc64" BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm MAKE_ENV+= ARCH_X86_64="1" .endif MAKE_ARGS+= ARCH=${ARCH} .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 -funroll-loops -ffast-math .endif .if !defined(WITHOUT_GPAC) BUILD_DEPENDS+= gpac-libgpac>=0.4.0.r2,1:${PORTSDIR}/multimedia/gpac-libgpac LIB_DEPENDS+= gpac.1:${PORTSDIR}/multimedia/gpac-libgpac CONFIGURE_ARGS+= --enable-mp4-output .endif .if defined(WITH_X11_OUTPUT) CONFIGURE_ARGS+= --enable-visualize USE_XLIB= yes .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \ s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile \ ${WRKSRC}/*/Makefile pre-install: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/x264.pc .include diff --git a/multimedia/x264/files/patch-encoder_ratecontrol.c b/multimedia/x264/files/patch-encoder_ratecontrol.c deleted file mode 100644 index 7e10b7b28297..000000000000 --- a/multimedia/x264/files/patch-encoder_ratecontrol.c +++ /dev/null @@ -1,13 +0,0 @@ ---- encoder/ratecontrol.c.orig Thu May 11 13:35:36 2006 -+++ encoder/ratecontrol.c Thu May 11 13:36:57 2006 -@@ -38,6 +38,9 @@ - #if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) - #define exp2f(x) powf( 2, (x) ) - #endif -+#if defined(__FreeBSD__) && (__FreeBSD__ < 5) -+#define isfinite(val) (!isnan((val)) && !isinf((val))) -+#endif - #if defined(SYS_MACOSX) - #define exp2f(x) (float)pow( 2, (x) ) - #define sqrtf sqrt - diff --git a/multimedia/x264/pkg-plist b/multimedia/x264/pkg-plist index 8485966a9280..52b74f4877ca 100644 --- a/multimedia/x264/pkg-plist +++ b/multimedia/x264/pkg-plist @@ -1,16 +1,16 @@ bin/x264 %%GTK%%bin/x264_gtk_encode include/x264.h -%%GTK%%binclude/x264_gtk.h -%%GTK%%binclude/x264_gtk_enum.h +%%GTK%%include/x264_gtk.h +%%GTK%%include/x264_gtk_enum.h lib/libx264.a lib/libx264.so lib/libx264.so.50 -%%GTK%%blib/libx264gtk.a -%%GTK%%blib/libx264gtk.so -%%GTK%%blib/libx264gtk.so.50 +%%GTK%%lib/libx264gtk.a +%%GTK%%lib/libx264gtk.so +%%GTK%%lib/libx264gtk.so.50 libdata/pkgconfig/x264.pc -%%GTK%%blibdata/pkgconfig/x264gtk.pc -%%GTK%%bshare/locale/fr/LC_MESSAGES/x264_gtk.mo -%%GTK%%b%%DATADIR%%/x264.png -%%GTK%%b@dirrm %%DATADIR%% +%%GTK%%libdata/pkgconfig/x264gtk.pc +%%GTK%%share/locale/fr/LC_MESSAGES/x264_gtk.mo +%%GTK%%%%DATADIR%%/x264.png +%%GTK%%@dirrm %%DATADIR%%