rpms/x264/devel x264-gf_malloc.patch,NONE,1.1 x264.spec,1.41,1.42
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7817
Modified Files:
x264.spec
Added Files:
x264-gf_malloc.patch
Log Message:
* Mon Jun 25 2012 Sérgio Basto <sergio(a)serjux.com> - 0.124-5.20120616
- Fixed detection of gf_malloc and gf_free
x264-gf_malloc.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE x264-gf_malloc.patch ---
--- 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"
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- x264.spec 24 Jun 2012 17:54:08 -0000 1.41
+++ x264.spec 25 Jun 2012 21:25:11 -0000 1.42
@@ -18,14 +18,18 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.124
-Release: 4.%{snapshot}%{?dist}
+Release: 5.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
+
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
+#upstreamable patches
+Patch100: x264-gf_malloc.patch
+
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
@@ -81,6 +85,7 @@
%setup -q -c -n %{name}-%{branch}-%{snapshot}
pushd %{name}-%{branch}-%{snapshot}
%patch0 -p1 -b .nover
+%patch100 -p1 -b .gf_malloc
popd
variants="generic generic10"
%ifarch i686
@@ -179,6 +184,9 @@
%{_libdir}/libx26410b.so
%changelog
+* Mon Jun 25 2012 Sérgio Basto <sergio(a)serjux.com> - 0.124-5.20120616
+- Fixed detection of gf_malloc and gf_free
+
* Sun Jun 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.124-4.20120616
- unbootstrap.