diff --git a/.gitignore b/.gitignore index 7b500d9..2b4dfe5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -x264-0.136-20131005-3361d59.tar.bz2 +x264-0.138-20131030-c628e3b.tar.bz2 diff --git a/sources b/sources index b0324a8..b18dca2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb391d91d364f24c06bef27329ca3de1 x264-0.136-20131005-3361d59.tar.bz2 +3949edd82cd13e020112bb04a23646da x264-0.138-20131030-c628e3b.tar.bz2 diff --git a/x264-gf_malloc.patch b/x264-gf_malloc.patch deleted file mode 100644 index cbb4975..0000000 --- a/x264-gf_malloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- x264-stable-20120616/configure.orig 2012-06-25 21:18:18.324187703 +0100 -+++ x264-stable-20120616/configure 2012-06-25 21:19:19.312886154 +0100 -@@ -904,7 +904,7 @@ if [ "$gpac" = "auto" ] ; then - fi - if [ "$gpac" = "yes" ] ; then - define HAVE_GPAC -- if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "gf_malloc(1); gf_free(NULL);" ; then -+ if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "void *p; p = gf_malloc(1); gf_free(p);" ; then - define HAVE_GF_MALLOC - fi - LDFLAGSCLI="$GPAC_LIBS $LDFLAGSCLI" diff --git a/x264.spec b/x264.spec index a24f097..a0e59da 100644 --- a/x264.spec +++ b/x264.spec @@ -1,11 +1,11 @@ -%global api 136 -%global gitdate 20131005 -%global gitversion 3361d59 +%global api 138 +%global gitdate 20131030 +%global gitversion c628e3b %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable -#global _with_bootstrap 1 +%global _with_bootstrap 1 %{?_with_bootstrap: %global _without_gpac 1 @@ -191,6 +191,9 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Sat Nov 02 2013 Sérgio Basto - 0.138-20131030-c628e3b +- Update to 0.138 git c628e3b (stable branch) and bootstrap for new ffmpeg. + * Fri Oct 18 2013 Sérgio Basto - 0.136-1.20131005git3361d59 - Update to 0.136 git 3361d59 (stable branch).