Request 14 (accepted)

gpac.changes Changed

gpac.spec Changed

@@ -34,14 +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-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-OPENSUSE marguerite@opensuse.org - libpng include dir fix
+Patch4:		gpac-0.5.0-libpng-version-detection.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
-Patch7:		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 - export functions needed by x264
+Patch7:		gpac-0.5.0-x264-export.patch
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
@@ -192,15 +192,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%if 0%{?suse_version} >= 1230
 %patch4 -p1
-%endif
-%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
@@ -379,6 +373,7 @@
 %doc doc/html/*
 %{_includedir}/%{name}/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 %files -n Osmo4
 %defattr(-,root,root)

gpac-0.5.0-libpng-version-detection.patch Added

@@ -0,0 +1,72 @@
+Index: gpac-0.5.0.svn4668/configure
+===================================================================
+--- gpac-0.5.0.svn4668.orig/configure
++++ gpac-0.5.0.svn4668/configure
+@@ -1149,27 +1149,40 @@ int main( void ) { return 0; }
+ EOF
+ 
+ if test "$cross_prefix" = "" ; then
+-    png_cflags="-I$prefix/include"
+-    png_lflags="-L$prefix/lib -lpng -lz"
++    png_flavor=""
++    if [ -d /usr/include/libpng16 ] ; then \
++	png_flavor="png16"
++    elif [ -d /usr/include/libpng15 ] ; then \
++	png_flavor="png15"
++    elif [ -d /usr/include/libpng14 ] ; then \
++	png_flavor="png14"
++    elif [ -d /usr/include/libpng12 ] ; then \
++        png_flavor="png12"
++    else
++	png_flavor="png"
++    fi
++
++    png_cflags="-I$prefix/include/lib$png_flavor"
++    png_lflags="-L$prefix/$libdir -l$png_flavor -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 -l$png_flavor -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
++        if $cc -o $TMPO $TMPC -I$alt_macosx_dir/include/lib$png_flavor -L$alt_macosx_dir/$libdir $LDFLAGS -l$png_flavor 2> /dev/null ; then
+             has_png="system"
+         fi
+     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_flavor -L$local_lib -l$png_flavor 2> /dev/null  ; then
+         has_png="local"
+     fi
+ fi
+ 
+-
++sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
+ 
+ #look for MAD support
+ cat > $TMPC << EOF
+@@ -2823,6 +2836,7 @@ if test "$has_jpeg" != "no" ; then
+ fi
+ 
+ echo "CONFIG_PNG=$has_png" >> config.mak
++echo "png_flavor=$png_flavor" >> config.mak
+ if test "$has_png" != "no" ; then
+     echo "#define GPAC_HAS_PNG" >> $TMPH
+ 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+= -l$(png_flavor)
+ ifeq ($(CONFIG_PNG), local)
+ NEED_LOCAL_LIB="yes"
+ MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.5.0-libpng12.patch Deleted

@@ -1,54 +0,0 @@
-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 Deleted

@@ -1,54 +0,0 @@
-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 Deleted

@@ -1,54 +0,0 @@
-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-no-pc.patch Added

gpac-0.5.0-x264-export.patch Added

Overview

Request 14 (accepted)

Request History