Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."

This reverts commit 67dda12f04.
el8
Sérgio M. Basto 6 years ago
parent 3ac3557c53
commit 448f5b4fba

@ -1,11 +1,13 @@
--- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
+++ ./configure 2019-04-29 03:48:04.806285957 +0100
@@ -1206,7 +1206,7 @@ fi
+++ ./configure 2019-03-12 01:10:12.603640526 +0000
@@ -1207,7 +1207,9 @@ fi
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
- GPAC_LIBS="-lgpac_static"
+ GPAC_LIBS="-lgpac"
cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
GPAC_LIBS="-lgpac_static"
- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
+ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do
+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
+ done
if [ "$SYS" = "WINDOWS" ] ; then
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"

@ -34,7 +34,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
Release: 7%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
Release: 8%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@ -210,6 +210,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
* Tue May 07 2019 Sérgio Basto <sergio@serjux.com> - 0.157-8.20190303git72db437
- Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
* Wed May 01 2019 Leigh Scott <leigh123linux@gmail.com> - 0.157-7.20190303git72db437
- Fix ARM rpm mangle issue

Loading…
Cancel
Save