[SCM] ffmpeg/master: Fix altivec-extra compile time optimization.
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Fri Jan 15 22:16:07 UTC 2016
The following commit has been merged in the master branch:
commit 3b629fd62f1eca78eff90b569949e7137837e727
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Fri Jan 15 20:13:33 2016 +0100
Fix altivec-extra compile time optimization.
diff --git a/debian/rules b/debian/rules
index 24d6136..ebfd6bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,10 +219,10 @@ override_dh_auto_build-arch:
for flavor in $(FLAVORS); do \
echo " *** $$flavor ***"; \
if echo "$$flavor" | grep -q "extra"; then \
- subdir=`echo "$$flavor" | grep "-" | sed 's_\(.*\)-.*_debian/\1/_'`; \
+ subdir=`[ "$$flavor" = "extra" ] && echo "debian/standard/" || echo "debian/altivec/"`; \
for dir in `cd ./$$subdir; find libavcodec libavutil libswresample -type d`; do \
mkdir -p debian/"$$flavor"/"$$dir"; \
- echo debian/standard/"$$subdir$$dir"/*.o | grep -q '*' || cp debian/standard/"$$subdir$$dir"/*.o debian/"$$flavor"/"$$dir"; \
+ echo "$$subdir$$dir"/*.o | grep -q '*' || cp "$$subdir$$dir"/*.o debian/"$$flavor"/"$$dir"; \
done; \
rm debian/"$$flavor"/libavcodec/allcodecs.o; \
fi; \
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list