Date: Mon, 27 Jul 2015 00:11:50 +0200 From: Koop Mast <kwm@rainbow-runner.nl> To: Tijl Coosemans <tijl@freebsd.org>, svn-ports-head@freebsd.org Subject: Re: svn commit: r392950 - head/multimedia/gstreamer1-plugins Message-ID: <55B55B26.1040804@rainbow-runner.nl> In-Reply-To: <201507262206.t6QM6xYY096085@repo.freebsd.org> References: <201507262206.t6QM6xYY096085@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, I reverted the new regex. It also caught libraries it doesn't affect. So breaking gstreamer1-plugin-bad and after fiddling around to allow -bad to build it broke other plugins. So I decided to bring back the blob of sed lines. I do like the more light approach though, if you can come up with a variant that allows all plugins to build. I will be happy to test any patches in my poudriere if you don't have the way of doing that yourself. -Koop On 27-7-2015 0:06, Koop Mast wrote: > Author: kwm > Date: Sun Jul 26 22:06:58 2015 > New Revision: 392950 > URL: https://svnweb.freebsd.org/changeset/ports/392950 > > Log: > Revert r392917 and part of r392902 (to gstreamer1-plugins/Makefile). > > The new regex was too broad and broke the plugins from the -bad package. > > Modified: > head/multimedia/gstreamer1-plugins/Makefile > > Modified: head/multimedia/gstreamer1-plugins/Makefile > ============================================================================== > --- head/multimedia/gstreamer1-plugins/Makefile Sun Jul 26 21:54:32 2015 (r392949) > +++ head/multimedia/gstreamer1-plugins/Makefile Sun Jul 26 22:06:58 2015 (r392950) > @@ -137,9 +137,32 @@ post-patch: > .endif > .if ${DIST} != ugly > @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ > - ${XARGS} -n 10 ${REINPLACE_CMD} \ > - -e '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/[^[:space:]]*\.la,,' \ > - -e 's|$$(top_builddir)/gst-libs/[^[:space:]]*/lib\([^/[:space:]]*\)\.la|-l\1|' > + ${XARGS} -n 10 ${REINPLACE_CMD} -e \ > + '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \ > + 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la|-lgsttag-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|-lgstaudio-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|-lgstpbutils-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|-lgstriff-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|-lgstsignalprocessor-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|' > + > + @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \ > + ${XARGS} -n 10 ${REINPLACE_CMD} -e \ > + '/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \ > + 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|-lgsttag-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|-lgstaudio-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|-lgstpbutils-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|-lgstriff-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|-lgstsignalprocessor-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|-lgstbasevideo-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_API_VERSION).la|-lgstvideo-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-$$(GST_API_VERSION).la|-lgstbadbase-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$$(GST_API_VERSION).la|-lgsturidownloader-${VERSION}|; \ > + s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|' > .endif > > # workaround a crash in clang 3.3 crash llvm bug # 15840 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55B55B26.1040804>