diff options
| author | ahze <ahze@FreeBSD.org> | 2005-05-04 15:55:56 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-05-04 15:55:56 +0800 |
| commit | f34c34acfaf1c42876bbfb16486ef921a6ac75ca (patch) | |
| tree | 0346f9262304d8c0fdc78f4eae89b620aa29aab1 /multimedia | |
| parent | 344636779aec95984d92f879c879519a3322b078 (diff) | |
| download | freebsd-ports-graphics-f34c34acfaf1c42876bbfb16486ef921a6ac75ca.tar.gz freebsd-ports-graphics-f34c34acfaf1c42876bbfb16486ef921a6ac75ca.tar.zst freebsd-ports-graphics-f34c34acfaf1c42876bbfb16486ef921a6ac75ca.zip | |
- Add new OPTION, WITH_GPAC, on by default. This enables you to
export H.264 media in mpeg4 wrapper.
- Bump PORTREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 12 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index da36bea0809..830df78fc4f 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20050421 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|ahze/|} # http://download.videolan.org/pub/videolan/contrib/ \ @@ -32,11 +33,12 @@ PLIST_FILES= bin/x264 \ lib/libx264.so \ lib/libx264.so.${SHLIB_VER} -OPTIONS= DEBUG "Enable Debugging" Off \ +OPTIONS= GPAC "Enable MPEG-4 Output" On \ + DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC" \ - --extra-ldflags="${LDFLAGS}" +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" .include <bsd.port.pre.mk> @@ -58,6 +60,10 @@ CONFIGURE_ARGS+= --enable-debug CFLAGS+= -O2 -funroll-loops -ffast-math .endif +.if !defined(WITHOUT_GPAC) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libm4systems_static.a:${PORTSDIR}/multimedia/gpac-libm4systems +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index da36bea0809..830df78fc4f 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -7,6 +7,7 @@ PORTNAME= x264 PORTVERSION= 0.0.20050421 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|ahze/|} # http://download.videolan.org/pub/videolan/contrib/ \ @@ -32,11 +33,12 @@ PLIST_FILES= bin/x264 \ lib/libx264.so \ lib/libx264.so.${SHLIB_VER} -OPTIONS= DEBUG "Enable Debugging" Off \ +OPTIONS= GPAC "Enable MPEG-4 Output" On \ + DEBUG "Enable Debugging" Off \ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off -CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC" \ - --extra-ldflags="${LDFLAGS}" +CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \ + --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" .include <bsd.port.pre.mk> @@ -58,6 +60,10 @@ CONFIGURE_ARGS+= --enable-debug CFLAGS+= -O2 -funroll-loops -ffast-math .endif +.if !defined(WITHOUT_GPAC) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libm4systems_static.a:${PORTSDIR}/multimedia/gpac-libm4systems +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include |