Request 13 (accepted)

gpac.changes Changed

gpac.spec Changed

@@ -17,30 +17,14 @@
 
 %define soname		2
 
-# workaround for Tumbleweed. Because we can't detect it directly.
-%if 0%{?suse_version} >= 1210
-%define xulrunner_version %(rpm -q --qf '%%{VERSION}' xulrunner-devel | sed 's|\\..*$||')
-%else
-%define xulrunner192_version %(rpm -q --qf '%%{VERSION}' mozilla-xulrunner192-devel | sed 's|\\..*$||')
-%endif
-
-# obs@botter.cc - ugly hack to disable compilation with xulrunnner 17.0.2
-%if 0%{?xulrunner_version} == 17
-%define wo_applications 1
-%else
-%define wo_applications 0
-%endif
-
 Name:           gpac
-Version:        0.5.0.svn4296
+Version:        0.5.0.svn4668
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source:         gpac-%{version}.tar.bz2
-Source1:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-b00.zip
-Source2:        http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip
 Url:            http://gpac.sourceforge.net
+Source:		%{name}-%{version}.tar.bz2
 Source90:       %{name}-rpmlintrc
 #PATCH-FIX-openSUSE i@marguerite.su - openSUSE only fix for sf#3574796
 Patch0:         gpac-0.5.0-smjs_call_prop_stub.patch
@@ -50,10 +34,14 @@
 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
-#PATCH-FIX-UPSTREAM i@marguerite.su - export functions x264 needs
-Patch4:		gpac-0.5.0-x264-export.patch
-#PATCH-FIX-UPSTREAM obs@botter.cc - disable applications osmozilla, osmo4_wx
-Patch10:	gpac-0.5.0-disable-applications.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng15 include dir fix
+Patch4:		gpac-0.5.0-libpng15.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng14 include dir fix
+Patch5:		gpac-0.5.0-libpng14.patch
+#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng12 include dir fix
+Patch6:		gpac-0.5.0-libpng12.patch
+#PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
+Patch7:		gpac-0.5.0-system-amr.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -161,7 +149,6 @@
 
 Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
 
-%if ! %{wo_applications}
 %package -n Osmo4
 Summary:        MPEG-4 Media player based on gpac
 Group:          Productivity/Multimedia/Video/Players
@@ -196,37 +183,25 @@
 %description browser-plugin
 Osmozilla is a GPAC plugin for Mozilla-based browsers.
 %endif
-%endif
 
 %prep
 %setup -q
 %if 0%{?suse_version} >= 1210
-%if 0%{?xulrunner_version} >= 16
-%patch0 -p1
-%endif
-%else
 %patch0 -p1
 %endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if 0%{?suse_version} >= 1230
 %patch4 -p1
-%if %{wo_applications}
-%patch10 -p1
 %endif
-
-# unpack amr files
-install -dm 755 modules/amr_float_dec/amr_nb_ft
-pushd modules/amr_float_dec/amr_nb_ft
-    unzip -q %{SOURCE1}
-    unzip -qj 26104-b00_ANSI_C_source_code.zip
-popd
-
-install -dm 755 modules/amr_float_dec/amr_wb_ft
-pushd modules/amr_float_dec/amr_wb_ft
-    unzip -q %{SOURCE2}
-    unzip -qj 26204-b00_ANSI-C_source_code.zip
-popd
+%if 0%{?suse_version} == 1220 || 0%{?suse_version} == 1210
+%patch5 -p1
+%endif
+%if 0%{?suse_version} <= 1140
+%patch6 -p1
+%endif
+%patch7 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -300,9 +275,6 @@
 %if ! 0%{?sles_version}
     --xulsdk-path=`pkg-config --variable=sdkdir libxul` \
 %endif
-%if %{wo_applications}
-    --disable-scenegraph \
-%endif
     --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 ...)
@@ -325,7 +297,6 @@
 make install-lib \
     DESTDIR=%{buildroot}
 
-%if ! %{wo_applications}
 # browser-plugin
 %if ! 0%{?sles_version}
 install -dm 755 %{buildroot}%{_libdir}/browser-plugins
@@ -334,7 +305,6 @@
 install -m 755 bin/gcc/nposmozilla.xpt \
     %{buildroot}%{_libdir}/browser-plugins
 %endif
-%endif
 
 # generated sggen binaries
 for i in MPEG4 SVG X3D; do
@@ -348,7 +318,6 @@
 install -m 755 bin/gcc/udptsseg \
     %{buildroot}%{_bindir}
 
-%if ! %{wo_applications}
 # Osmo4
 install -m 755 bin/gcc/Osmo4 \
     %{buildroot}%{_bindir}
@@ -359,9 +328,7 @@
     Osmo4.png
 install -m 644 Osmo4.png \
     %{buildroot}%{_datadir}/pixmaps
-%endif
 
-%if ! %{wo_applications}
 # menu-entry
 install -dm 755 %{buildroot}%{_datadir}/applications
 cat > Osmo4.desktop << EOF
@@ -375,7 +342,6 @@
 Terminal=false
 EOF
 %suse_update_desktop_file -i Osmo4 AudioVideo Player
-%endif
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -390,10 +356,9 @@
 %defattr(-,root,root)
 %doc AUTHORS BUGS Changelog COPYING README TODO
 %doc doc/configuration.html
+%{_bindir}/DashCast
 %{_bindir}/MP4Box
-%if ! %{wo_applications}
 %{_bindir}/MP4Client
-%endif
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
@@ -415,7 +380,6 @@
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 
-%if ! %{wo_applications}
 %files -n Osmo4
 %defattr(-,root,root)
 %{_bindir}/Osmo4
@@ -427,6 +391,5 @@
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/nposmozilla.*
 %endif
-%endif
 
 %changelog

gpac-0.5.0-disable-applications.patch Deleted

gpac-0.5.0-libpng12.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng12 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng12 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng12 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng12
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng12/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-libpng14.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng14 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng14 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng14 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng14
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng14/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-libpng15.patch Added

@@ -0,0 +1,54 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1150,12 +1150,12 @@ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+     png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_lflags="-L$prefix/lib -lpng15 -lz"
+     #-nostdlib prevents from searching standard compiler libraries
+     #if $cc -o $TMPO $TMPC -nostdlib $png_cflags $png_lflags 2> /dev/null  ; then
+     if $cc -o $TMPO $TMPC $png_cflags $png_lflags $LDFLAGS 2> /dev/null  ; then
+         has_png="system"
+-    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng -lz 2> /dev/null  ; then
++    elif $cc -o $TMPO $TMPC $LDFLAGS -lpng15 -lz 2> /dev/null  ; then
+         has_png="system"
+     elif test "$alt_macosx_dir" != "" ; then
+         if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lpng 2> /dev/null ; then
+@@ -1164,7 +1164,7 @@ if test "$cross_prefix" = "" ; then
+     fi
+ fi
+ if test "$has_png" = "no" ; then
+-    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng 2> /dev/null  ; then
++    if $cc -o $TMPO $TMPC -I$local_inc/png -L$local_lib -lpng15 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+Index: gpac-0.5.0.svn4668/src/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/Makefile
++++ gpac-0.5.0.svn4668/src/Makefile
+@@ -495,7 +495,7 @@ endif
+ #5 - PNG support
+ ifeq ($(CONFIG_PNG), no)
+ else
+-LINKLIBS+= -lpng
++LINKLIBS+= -lpng15
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+Index: gpac-0.5.0.svn4668/src/media_tools/img.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/src/media_tools/img.c
++++ gpac-0.5.0.svn4668/src/media_tools/img.c
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ /*include png.h before setjmp.h, otherwise we get compilation errors*/
+-#include <png.h>
++#include <libpng15/png.h>
+ 
+ #endif /*GPAC_HAS_PNG*/
+

gpac-0.5.0-smjs_call_prop_stub.patch Changed

gpac-0.5.0-system-amr.patch Added

@@ -0,0 +1,56 @@
+Index: gpac-0.5.0.svn4668/modules/amr_float_dec/Makefile
+===================================================================
+--- gpac-0.5.0.svn4668.orig/modules/amr_float_dec/Makefile
++++ gpac-0.5.0.svn4668/modules/amr_float_dec/Makefile
+@@ -18,19 +18,19 @@ endif
+ #common obj
+ OBJS=../amr_dec/amr_in.o amr_float_dec.o
+ 
++AMR_LIBS=
++
+ #AMR NB obj
+ CFLAGS+=-DGPAC_HAS_AMR_FT
+ ifeq ($(CONFIG_AMR_NB_FT), yes)
+-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
++AMR_LIBS+=-lamrnb
+ endif
+ 
+ 
+ #AMR WB obj
+ CFLAGS+=-DGPAC_HAS_AMR_FT_WB
+ ifeq ($(CONFIG_AMR_WB_FT), yes)
+-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
+-	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
+-	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
++AMR_LIBS+=-lamrwb
+ endif
+ 
+ 
+@@ -45,7 +45,7 @@ all: $(LIB)
+ 
+ 
+ $(LIB): $(OBJS)
+-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac
++	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS)
+ 
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+Index: gpac-0.5.0.svn4668/modules/amr_float_dec/amr_float_dec.c
+===================================================================
+--- gpac-0.5.0.svn4668.orig/modules/amr_float_dec/amr_float_dec.c
++++ gpac-0.5.0.svn4668/modules/amr_float_dec/amr_float_dec.c
+@@ -46,12 +46,12 @@
+ 
+ #ifdef GPAC_HAS_AMR_FT
+ /*AMR WB*/
+-#include "amr_nb_ft/interf_dec.h"
++#include <amrnb/interf_dec.h>
+ #endif
+ 
+ #ifdef GPAC_HAS_AMR_FT_WB
+ /*AMR WB*/
+-#include "amr_wb_ft/dec_if.h"
++#include <amrwb/dec_if.h>
+ #endif
+ 
+ #endif

gpac-0.5.0-x264-export.patch Deleted

@@ -1,30 +0,0 @@
-diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c gpac-0.5.0.svn4192/src/isomedia/avc_ext.c
---- gpac-0.5.0.svn4192.orig/src/isomedia/avc_ext.c	2012-11-01 07:44:25.104487689 +0800
-+++ gpac-0.5.0.svn4192/src/isomedia/avc_ext.c	2012-11-01 17:46:04.064318199 +0800
-@@ -191,6 +191,7 @@
- 
- 
- #ifndef GPAC_DISABLE_ISOM_WRITE
-+GF_EXPORT
- GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
- {
- 	GF_TrackBox *trak;
-diff -urN gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c gpac-0.5.0.svn4192/src/isomedia/isom_write.c
---- gpac-0.5.0.svn4192.orig/src/isomedia/isom_write.c	2012-11-01 07:44:25.102487699 +0800
-+++ gpac-0.5.0.svn4192/src/isomedia/isom_write.c	2012-11-01 17:45:30.020931257 +0800
-@@ -1141,6 +1141,7 @@
- 	return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
- {
- 	GF_Err e;
-@@ -1188,6 +1189,7 @@
- 	}
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
- {
- 	GF_Err e;

26104-b00.zip Deleted

26204-b00.zip Deleted

gpac-0.5.0.svn4296.tar.bz2 -> gpac-0.5.0.svn4668.tar.bz2 Changed

Overview

Request 13 (accepted)

Request History