summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-18 08:13:16 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2005-02-18 08:13:16 +0800
commit0e722af9b42d71cc5e0b796d6c7a8680fe7f9617 (patch)
treee5d500e3f189d300506cb8052f727fe8f5d0c596
parent57ed92cae1460f3df4a256251e9a0dd71569c49c (diff)
downloadmarcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar.gz
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar.bz2
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar.lz
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar.xz
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.tar.zst
marcuscom-ports-0e722af9b42d71cc5e0b796d6c7a8680fe7f9617.zip
Fix a nasty bug in the new(TM) gstreamer framework.
Run gst-register when deinstall, installing/deinstalling a gst-plugin packages. Remove half-cooked attempt to fix the bug above. Fix a whitespace nit in plist. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3668 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common7
-rw-r--r--multimedia/gstreamer-plugins/pkg-plist2
-rw-r--r--multimedia/gstreamer-plugins80/Makefile.common7
-rw-r--r--multimedia/gstreamer-plugins80/pkg-plist2
4 files changed, 8 insertions, 10 deletions
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 6a56aa0b3..d5fecbf3a 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -420,15 +420,14 @@ LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
LIB_DEPENDS+= gstgconf-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+PLIST_FILES+= '@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true'
+PLIST_FILES+= '@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true'
+
do-build:
.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
.endfor
- @${ECHO_CMD} "@unexec ${PREFIX}/bin/gst-register-${GST_VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml" \
- >> ${TMPPLIST}
-
post-build:
@${ECHO_CMD} ${PREFIX}/bin/gst-register-${GST_VERSION} \
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index a8ac681ae..96213ced8 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -38,7 +38,7 @@ lib/gstreamer-%%VERSION%%/libgstadder.so
lib/gstreamer-%%VERSION%%/libgstalaw.so
lib/gstreamer-%%VERSION%%/libgstalpha.so
lib/gstreamer-%%VERSION%%/libgstalphacolor.so
-lib/gstreamer-%%VERSION%%/libgstapetag.so
+lib/gstreamer-%%VERSION%%/libgstapetag.so
lib/gstreamer-%%VERSION%%/libgstasf.so
lib/gstreamer-%%VERSION%%/libgstaudio.so
lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
index 6a56aa0b3..d5fecbf3a 100644
--- a/multimedia/gstreamer-plugins80/Makefile.common
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -420,15 +420,14 @@ LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
LIB_DEPENDS+= gstgconf-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+PLIST_FILES+= '@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true'
+PLIST_FILES+= '@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true'
+
do-build:
.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
.endfor
- @${ECHO_CMD} "@unexec ${PREFIX}/bin/gst-register-${GST_VERSION} \
- --gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml" \
- >> ${TMPPLIST}
-
post-build:
@${ECHO_CMD} ${PREFIX}/bin/gst-register-${GST_VERSION} \
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index a8ac681ae..96213ced8 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -38,7 +38,7 @@ lib/gstreamer-%%VERSION%%/libgstadder.so
lib/gstreamer-%%VERSION%%/libgstalaw.so
lib/gstreamer-%%VERSION%%/libgstalpha.so
lib/gstreamer-%%VERSION%%/libgstalphacolor.so
-lib/gstreamer-%%VERSION%%/libgstapetag.so
+lib/gstreamer-%%VERSION%%/libgstapetag.so
lib/gstreamer-%%VERSION%%/libgstasf.so
lib/gstreamer-%%VERSION%%/libgstaudio.so
lib/gstreamer-%%VERSION%%/libgstaudioconvert.so