* Mon Sep 30 2013 Sérgio Basto <sergio@serjux.com> - 0.133-3.20130709git585324f

- Fix gpac detection.
el8
Sérgio M. Basto 11 years ago
parent 225162303a
commit f8c3809ea7

@ -0,0 +1,11 @@
--- generic10/configure 2013-09-30 01:59:40.537691428 +0100
+++ generic/configure 2013-09-30 02:24:21.637654522 +0100
@@ -917,7 +917,7 @@ fi
if [ "$gpac" = "auto" ] ; then
gpac="no"
- cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" || GPAC_LIBS="-lgpac_static"
+ cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz -lssl -lcrypto -lpng -ljpeg" || GPAC_LIBS="-lgpac_static"
if [ "$SYS" = "WINDOWS" ] ; then
GPAC_LIBS="$GPAC_LIBS -lwinmm"
fi

@ -24,7 +24,7 @@
Summary: H264/AVC video streams encoder Summary: H264/AVC video streams encoder
Name: x264 Name: x264
Version: 0.%{api} Version: 0.%{api}
Release: 2%{?gver}%{?dist} Release: 3%{?gver}%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html URL: http://developers.videolan.org/x264.html
@ -34,8 +34,9 @@ BuildRequires: perl-Digest-MD5
# don't remove config.h and don't re-run version.sh # don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch Patch0: x264-nover.patch
Patch10: x264-gpac.patch
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel} %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel} %{?_with_visualize:BuildRequires: libX11-devel}
@ -90,6 +91,7 @@ This package contains the development files.
%setup -q -c -n %{name}-0.%{api}-%{snapshot} %setup -q -c -n %{name}-0.%{api}-%{snapshot}
pushd %{name}-0.%{api}-%{snapshot} pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover %patch0 -p1 -b .nover
%patch10 -p1 -b .gpac
popd popd
variants="generic generic10" variants="generic generic10"
@ -189,6 +191,9 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl
%{_libdir}/libx26410b.so %{_libdir}/libx26410b.so
%changelog %changelog
* Mon Sep 30 2013 Sérgio Basto <sergio@serjux.com> - 0.133-3.20130709git585324f
- Fix gpac detection.
* Thu Aug 15 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.133-2.20130709git585324f * Thu Aug 15 2013 Nicolas Chauvet <kwizart@gmail.com> - 0.133-2.20130709git585324f
- Rebuilt for FFmpeg 2.0.x - Rebuilt for FFmpeg 2.0.x

Loading…
Cancel
Save