commit 748e513875c67743db8b935a8daee08bcacb501c
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat Mar 29 08:46:18 2014 +0100
- up to 20140328
libx264-gpac.patch | 16 ++++++++--------
libx264.spec | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/libx264.spec b/libx264.spec
index 45ea0c0..873d692 100644
--- a/libx264.spec
+++ b/libx264.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_with bootstrap # no ffmpeg/gpac support in x264 utility
#
-%define snap 20130827
+%define snap 20140328
%define snaph 2245
%define rel 1
Summary: H264 encoder library
@@ -14,7 +14,7 @@ License: GPL v2+
Group: Libraries
# still no releases, use snapshots
Source0:
ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{snap}-%{snaph}.tar.bz2
-# Source0-md5: 75ad3e023fbe87eff3efd6eaf15162be
+# Source0-md5: a71261477a692089b462a8fa387ba56b
Patch0: %{name}-alpha.patch
Patch1: altivec-no-vand.patch
Patch2: %{name}-gpac.patch
@@ -121,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS
-%attr(755,root,root) %{_libdir}/libx264.so.138
+%attr(755,root,root) %{_libdir}/libx264.so.142
%files devel
%defattr(644,root,root,755)
diff --git a/libx264-gpac.patch b/libx264-gpac.patch
index 71e1bf4..c07c54e 100644
--- a/libx264-gpac.patch
+++ b/libx264-gpac.patch
@@ -1,11 +1,11 @@
---- x264-snapshot-20110625-2245/configure.orig 2011-06-27 17:51:45.598468743
+0200
-+++ x264-snapshot-20110625-2245/configure 2011-06-27 22:04:22.675642925
+0200
-@@ -806,7 +806,7 @@
+--- x264-snapshot-20140328-2245/configure~ 2014-03-29 08:43:39.000000000
+0100
++++ x264-snapshot-20140328-2245/configure 2014-03-29 08:44:32.177299477
+0100
+@@ -950,7 +950,7 @@
- if [ "$gpac" = "auto" ] ; then
+ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
-- cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" ||
GPAC_LIBS="-lgpac_static"
-+ cc_check "" -lz && GPAC_LIBS="-lgpac -lz" || GPAC_LIBS="-lgpac"
+- GPAC_LIBS="-lgpac_static"
++ GPAC_LIBS="-lgpac"
+ cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
if [ "$SYS" = "WINDOWS" ] ; then
- GPAC_LIBS="$GPAC_LIBS -lwinmm"
- fi
+ cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libx264.git/commitdiff/748e513875c67743db8b935a8daee08bcacb501c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
