From 03dd6eb5eca09ce10c46e3d64c5a037be43ec541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Mon, 25 Jun 2012 21:25:11 +0000
Subject: [PATCH] =?UTF-8?q?*=20Mon=20Jun=2025=202012=20S=C3=A9rgio=20Basto?=
 =?UTF-8?q?=20<sergio@serjux.com>=20-=200.124-5.20120616=20-=20Fixed=20det?=
 =?UTF-8?q?ection=20of=20gf=5Fmalloc=20and=20gf=5Ffree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 x264-gf_malloc.patch | 11 +++++++++++
 x264.spec            | 10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 x264-gf_malloc.patch

diff --git a/x264-gf_malloc.patch b/x264-gf_malloc.patch
new file mode 100644
index 0000000..cbb4975
--- /dev/null
+++ b/x264-gf_malloc.patch
@@ -0,0 +1,11 @@
+--- 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 cb83add..e8478ce 100644
--- a/x264.spec
+++ b/x264.spec
@@ -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 @@ This package contains the development files.
 %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 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
 %{_libdir}/libx26410b.so
 
 %changelog
+* Mon Jun 25 2012 Sérgio Basto <sergio@serjux.com> - 0.124-5.20120616
+- Fixed detection of gf_malloc and gf_free
+
 * Sun Jun 24 2012 Sérgio Basto <sergio@serjux.com> - 0.124-4.20120616
 - unbootstrap.