Browse Source

self-build-gpac: update to 0.8.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12249 ec354946-7b23-47d6-9f5a-488ba84defc7
ara_t 2 years ago
parent
commit
5f20ef59bc
2 changed files with 27 additions and 13 deletions
  1. 17 8
      nonfree/self-build-gpac/gpac-vl.spec
  2. 10 5
      nonfree/self-build-gpac/self-build-gpac-vl.spec

+ 17 - 8
nonfree/self-build-gpac/gpac-vl.spec

@@ -4,8 +4,8 @@
 
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
-Version:     0.5.2
-Release:     4%{?svndate:.svn%svndate}%{?_dist_release}
+Version:     0.8.0
+Release:     1%{?svndate:.svn%svndate}%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -13,7 +13,8 @@ Source0:     https://github.com/gpac/gpac/archive/v%{version}.tar.gz
 #Source0:     gpac-%{svndate}.tar.bz2
 #Source9:     gpac-snapshot-vine.sh
 
-Patch2:      gpac-0.4.6-amr.patch
+# Patch2:      gpac-0.4.6-amr.patch
+Patch3:      gpac-compatibility-openssl-1.1.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -46,7 +47,7 @@ BuildRequires:  desktop-file-utils
 %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 # *-devel packages provided by other self-build-* should only be listed
 # in self-build-%{name}.spec as PreReq.
-#BuildRequires:  a52dec-devel
+##BuildRequires:  a52dec-devel
 #BuildRequires:  faad2-devel
 #BuildRequires:  libmad-devel
 #BuildRequires:  xvidcore-devel >= 1.0.0
@@ -99,7 +100,8 @@ Static library for gpac.
 ## remove extra_libs directory
 %__rm -rf extra_libs
 
-%patch2 -p1 -b .amr
+# %patch2 -p1 -b .amr
+# %patch3 -p1 -b .openssl-1.1
 
 ## kwizart - enable dynamic mode - hardcoded with patch2
 # define SONAME number from the first number of gpac version.
@@ -127,8 +129,6 @@ chmod +x configure
   --X11-path=%{_prefix} \
   --libdir=%{_lib} \
     --disable-oss-audio \
-    %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
-    %{?_with_amr:--enable-amr} \
     --disable-static \
     --use-js=no \
     \
@@ -167,6 +167,7 @@ touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h || exit 1
 touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h || exit 1
 %__rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h || exit 1
 
+rm -rf %{buildroot}%{_includedir}/win{32,ce}
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -178,7 +179,7 @@ touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h || exit 1
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS Changelog COPYING README TODO 
+%doc AUTHORS BUGS Changelog COPYING README.md TODO
 %{_bindir}/MP4*
 %{_bindir}/*Gen
 %{_datadir}/gpac/
@@ -205,6 +206,14 @@ touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h || exit 1
 
 
 %changelog
+* Wed Oct 09 2019 Toshiaki Ara <ara_t@384.jp> 0.8.0-1
+- new upstream release
+- change BR: self-build-a52dec to a52dec-devel
+
+* Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 0.7.1-1
+- new upstream release
+- add Patch3 for compatibility with openssl-1.1
+
 * Sun Jul 03 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.2-4
 - rebuild
 

+ 10 - 5
nonfree/self-build-gpac/self-build-gpac-vl.spec

@@ -2,7 +2,7 @@
 
 %define pkgname gpac
 %define name  self-build-%{pkgname}
-%define version 0.7.1
+%define version 0.8.0
 %define release 1%{?svndate:.svn%svndate}%{?_dist_release}
 
 %define sourceurl0  https://github.com/gpac/gpac/archive/v%{version}.tar.gz
@@ -17,7 +17,7 @@ Source0:  %{pkgname}-vl.spec
 #Source9:     gpac-snapshot-vine.sh
 
 # Source102:      gpac-0.4.6-amr.patch
-Source103:      gpac-compatibility-openssl-1.1.patch
+# Source103:      gpac-compatibility-openssl-1.1.patch
 
 License:  LGPLv2+
 Group:    Restricted Software
@@ -52,7 +52,8 @@ Requires(post):  libXv-devel
 #Requires(post):  doxygen
 Requires(post):  desktop-file-utils
 %{?_with_amr:Requires(post): amrnb-devel amrwb-devel}
-Requires(post):  self-build-a52dec
+Requires(post):  a52dec-devel
+# Requires(post):  self-build-a52dec
 Requires(post):  self-build-faad2
 Requires(post):  self-build-libmad
 Requires(post):  self-build-xvidcore >= 1.0.0
@@ -147,8 +148,8 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{__install} -m 644 %{SOURCE103} \
-    ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+# %{__install} -m 644 %{SOURCE103} \
+#     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -192,6 +193,10 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{_datadir}/%{name}
 
 %changelog
+* Wed Oct 09 2019 Toshiaki Ara <ara_t@384.jp> 0.8.0-1
+- new upstream release
+- change BR: self-build-a52dec to a52dec-devel
+
 * Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 0.7.1-1
 - new upstream release
 - add Patch3 for compatibility with openssl-1.1