svn commit: r392902 - in head/multimedia: . gstreamer1-plugins gstreamer1-plugins-hls

[Koop Mast]

On 26-7-2015 12:36, Tijl Coosemans wrote:
> On Sat, 25 Jul 2015 23:14:27 +0200 Koop Mast <kwm at rainbow-runner.nl> wrote:
>> On 25-7-2015 21:59, Tijl Coosemans wrote:
>>> --- head/multimedia/gstreamer1-plugins/Makefile	Sat Jul 25 17:11:37 2015	(r392901)
>>> +++ head/multimedia/gstreamer1-plugins/Makefile	Sat Jul 25 19:59:35 2015	(r392902)
>>> @@ -147,20 +147,8 @@ post-patch:
>>>  	s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo- at GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \
>>>  	s|$$(top_builddir)/gst-libs/gst/video/libgstvideo- at GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \
>>>  	s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase- at GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \
>>> +	s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader- at GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \
>>>  	s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo- at 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/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|'
>>>  .endif
>> Just making sure, have you tested this change? Because the last time I
>> looked it was still needed. Note the difference between
>> $$(GST_API_VERSION) and @GST_API_VERSION@
> Oops, I've combined both into one RE now in r392917.
Thanks, and thanks for reducing the blob into something that is more
clean. Though now I need a almanac to figure out what the regex does but
I guess that is a small price to pay.

-Koop