diff options
| author | kwm <kwm@FreeBSD.org> | 2005-07-10 05:10:32 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2005-07-10 05:10:32 +0800 |
| commit | f0038f8d621ddb4c1f3a1366b376b86154d7131f (patch) | |
| tree | 3c2abc2a2359478b1890893804bc9ea5bd1a0a55 | |
| parent | f2b4227c40a963fa4d3a20ed55bfa88b78fc9496 (diff) | |
| download | freebsd-ports-gnome-f0038f8d621ddb4c1f3a1366b376b86154d7131f.tar.gz freebsd-ports-gnome-f0038f8d621ddb4c1f3a1366b376b86154d7131f.tar.zst freebsd-ports-gnome-f0038f8d621ddb4c1f3a1366b376b86154d7131f.zip | |
Fix packaging. Only build the spc plugin on i386 and depend on nasm.
Submitted by: pointyhat via kris
Approved by: maintainer (implicit)
| -rw-r--r-- | multimedia/gstreamer-plugins/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins/Makefile.common | 10 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins/pkg-plist | 2 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins80/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins80/Makefile.common | 10 | ||||
| -rw-r--r-- | multimedia/gstreamer-plugins80/pkg-plist | 2 |
6 files changed, 24 insertions, 6 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index d3fb13ac5d81..303d3598899b 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.10 +PORTREVISION= 1 CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ @@ -52,7 +53,7 @@ WITHOUT_CPU_CFLAGS= yes INSTALLS_SHLIB= yes -PLIST_SUB= VERSION="${VERSION}" \ +PLIST_SUB+= VERSION="${VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" MAN1= gst-launch-ext-0.8.1 gst-visualise-0.8.1 diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index dad62b30045b..a64c9b4879da 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -96,7 +96,6 @@ CONFIGURE_ARGS+=--disable-tests \ --disable-osx_video \ --disable-tarkin \ --enable-static \ - --enable-spc \ --disable-sunaudio \ --disable-gst_v4l \ --disable-gst_v4l2 \ @@ -105,6 +104,15 @@ CONFIGURE_ARGS+=--disable-tests \ --enable-xshm \ --enable-xvideo +.if (${ARCH} == "i386") +BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +CONFIGURE_ARGS+=--enable-spc +PLIST_SUB+= SPC="" +.else +CONFIGURE_ARGS+=--disable-spc +PLIST_SUB+= SPC="@comment " +.endif + .if ${GST_PLUGIN}!="base" GST_PLUGIN_SUFFIX?= -${GST_PLUGIN} diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index 18a73b2e9fac..512299914d5a 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -101,7 +101,7 @@ lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so -lib/gstreamer-%%VERSION%%/libgstspc.so +%%SPC%%lib/gstreamer-%%VERSION%%/libgstspc.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so lib/gstreamer-%%VERSION%%/libgststereo.so diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index d3fb13ac5d81..303d3598899b 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -7,6 +7,7 @@ PORTNAME= gstreamer PORTVERSION= 0.8.10 +PORTREVISION= 1 CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ @@ -52,7 +53,7 @@ WITHOUT_CPU_CFLAGS= yes INSTALLS_SHLIB= yes -PLIST_SUB= VERSION="${VERSION}" \ +PLIST_SUB+= VERSION="${VERSION}" \ SHLIB_VERSION="${SHLIB_VERSION}" MAN1= gst-launch-ext-0.8.1 gst-visualise-0.8.1 diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common index dad62b30045b..a64c9b4879da 100644 --- a/multimedia/gstreamer-plugins80/Makefile.common +++ b/multimedia/gstreamer-plugins80/Makefile.common @@ -96,7 +96,6 @@ CONFIGURE_ARGS+=--disable-tests \ --disable-osx_video \ --disable-tarkin \ --enable-static \ - --enable-spc \ --disable-sunaudio \ --disable-gst_v4l \ --disable-gst_v4l2 \ @@ -105,6 +104,15 @@ CONFIGURE_ARGS+=--disable-tests \ --enable-xshm \ --enable-xvideo +.if (${ARCH} == "i386") +BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +CONFIGURE_ARGS+=--enable-spc +PLIST_SUB+= SPC="" +.else +CONFIGURE_ARGS+=--disable-spc +PLIST_SUB+= SPC="@comment " +.endif + .if ${GST_PLUGIN}!="base" GST_PLUGIN_SUFFIX?= -${GST_PLUGIN} diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index 18a73b2e9fac..512299914d5a 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -101,7 +101,7 @@ lib/gstreamer-%%VERSION%%/libgstsilence.so lib/gstreamer-%%VERSION%%/libgstsinesrc.so lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstsmpte.so -lib/gstreamer-%%VERSION%%/libgstspc.so +%%SPC%%lib/gstreamer-%%VERSION%%/libgstspc.so lib/gstreamer-%%VERSION%%/libgstspectrum.so lib/gstreamer-%%VERSION%%/libgstspeed.so lib/gstreamer-%%VERSION%%/libgststereo.so |