Packman Build Service PMBS

gpac.changes Changed

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,89 +15,87 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define soname		3
 
+%define soname		4
 Name:           gpac
-Version:        0.5.1.svn5491
-Release:        1.pm.1
-License:        LGPL-2.1+
+Version:        0.5.1.svn5619
+Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
+License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 Url:            http://gpac.sourceforge.net
-Source:		%{name}-%{version}.tar.xz
+Source:         %{name}-%{version}.tar.xz
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:		gpac-0.5.1-enable_V4Studio.patch
+Patch1:         gpac-0.5.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
-Patch2:		gpac-0.5.0-SVGGen_abuild.patch
+Patch2:         gpac-0.5.0-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:		gpac-0.5.0-64bit-portability.patch
+Patch3:         gpac-0.5.0-64bit-portability.patch
 #PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:		gpac-0.5.0-libpng-version-detection.patch
+Patch4:         gpac-0.5.0-libpng-version-detection.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
-Patch5:		gpac-0.5.0-system-amr.patch
+Patch5:         gpac-0.5.0-system-amr.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:		gpac-0.5.0-no-pc.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - I:Statement is overflowing a buffer
-Patch8:		gpac-0.5.1-bufferoverflow.patch
+Patch6:         gpac-0.5.0-no-pc.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
 # not available to the public
-Patch9:		gpac-0.5.0-x264-export.patch
+Patch9:         gpac-0.5.0-x264-export.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
-Patch10:	gpac-0.5.1-u32-count-redeclaration.patch
+Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:	fdupes
+BuildRequires:  fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype2-devel
-BuildRequires:	graphviz
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} >= 1140
-BuildRequires:  libSDL-devel
-%else
-BuildRequires:  SDL-devel
-%endif
+BuildRequires:  graphviz
 BuildRequires:  liba52-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  libffmpeg-devel
-# fix for evergreen 11
-%if 0%{?suse_version} == 1110
-BuildRequires:  libidl
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmad-devel
 BuildRequires:  libogg-devel
+BuildRequires:  libopenssl-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libpulse-devel
 BuildRequires:  librsvg-devel >= 2.5.0
 BuildRequires:  libtheora-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libxvidcore-devel
+BuildRequires:  unzip
+BuildRequires:  update-desktop-files
+BuildRequires:  xz
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1140
+BuildRequires:  libSDL-devel
+%else
+BuildRequires:  SDL-devel
+%endif
+# fix for evergreen 11
+%if 0%{?suse_version} == 1110
+BuildRequires:  libidl
+%endif
 %if 0%{?suse_version} == 1140
 BuildRequires:  mozilla-js192
 %endif
 %if 0%{?suse_version} > 1140
 BuildRequires:  js-devel
 %endif
-BuildRequires:  libopenssl-devel
 %if 0%{?suse_version} > 1140
 BuildRequires:  pkgconfig(libopenjpeg)
 %endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  unzip
-BuildRequires:  update-desktop-files
 %if 0%{?suse_version} >= 1140
 BuildRequires:  wxWidgets-wxcontainer-devel
 %else
 BuildRequires:  wxGTK-devel
 %endif
-BuildRequires:  zlib-devel
-BuildRequires:	xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
@@ -180,7 +178,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 
@@ -199,6 +196,7 @@
 echo '#define GPAC_SVN_REVISION "5491"' > ./include/gpac/revision.h
 
 sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
+
 %build
 # configure the beast
 ./configure \
@@ -207,14 +205,14 @@
     --libdir=lib64 \
 %endif
     --mandir=%{_mandir} \
-    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC" 
+    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
 
 # make the beast (NO parallel build possible ...)
 # fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
-make all CFLAG="%{optflags}"
-make sggen 
-make -C applications/generators/SVG
-make -C applications/udptsseg
+make %{?_smp_mflags} all CFLAG="%{optflags}"
+make %{?_smp_mflags} sggen
+make %{?_smp_mflags} -C applications/generators/SVG
+make %{?_smp_mflags} -C applications/udptsseg
 
 # create dev-docs
 pushd doc
@@ -223,7 +221,7 @@
 popd
 
 %install
-%make_install 
+%make_install
 
 # header files
 make install-lib \
@@ -234,8 +232,6 @@
     install -m 755 applications/generators/$i/${i}Gen \
     	%{buildroot}%{_bindir}
 done
-install -m 755 bin/gcc/mp4* \
-    %{buildroot}%{_bindir}
 
 # udptsseg
 install -m 755 bin/gcc/udptsseg \
@@ -280,12 +276,12 @@
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
 %{_bindir}/DashCast
+%{_bindir}/MP42TS
 %{_bindir}/MP4Box
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
-%{_bindir}/mp42ts
 %{_bindir}/udptsseg
 %{_libdir}/%{name}/
 %{_datadir}/%{name}/
@@ -293,14 +289,14 @@

gpac-0.5.1-bufferoverflow.patch Deleted

gpac-0.5.1-u32-count-redeclaration.patch Changed

gpac-0.5.1.svn5491.tar.xz -> gpac-0.5.1.svn5619.tar.xz Changed

Changes of Revision 13