Refresh patches.

diff --git a/debian/patches/dfsg.patch b/debian/patches/dfsg.patch
index 22a7d5e02160a0d9b5a0b5907a5e091bf054291d..802331491c14c4298d26ecec4c664d33bff83d8c 100644 (file)
--- a/debian/patches/dfsg.patch
+++ b/debian/patches/dfsg.patch
@@ -7,10 +7,10 @@ Forwarded: no
 
 --- gpac.orig/modules/Makefile
 +++ gpac/modules/Makefile
-@@ -2,7 +2,7 @@ include ../config.mak
+@@ -1,7 +1,7 @@
+ include ../config.mak
  
  #all OS and lib independent
- #PLUGDIRS=aac_in ac3_in audio_filter bifs_dec ctx_load dummy_in soft_raster mp3_in isom_in odf_dec rtp_in timedtext img_in svg_in saf_in mpegts_in ismacryp widgetman redirect_av mpd_in
 -PLUGDIRS=aac_in ac3_in audio_filter bifs_dec ctx_load dummy_in soft_raster mp3_in isom_in odf_dec rtp_in timedtext img_in svg_in saf_in mpegts_in ismacryp widgetman mpd_in osd
 +PLUGDIRS=aac_in ac3_in audio_filter bifs_dec ctx_load dummy_in soft_raster mp3_in isom_in odf_dec rtp_in timedtext img_in svg_in saf_in mpegts_in ismacryp mpd_in osd
  

diff --git a/debian/patches/gcc-optflags.patch b/debian/patches/gcc-optflags.patch
index d3754100dce5f09a42707c1ab893d8f51a710744..d9ad7149e40aaaf84f5dbb6b31081092f931dddf 100644 (file)
--- a/debian/patches/gcc-optflags.patch
+++ b/debian/patches/gcc-optflags.patch
@@ -7,16 +7,16 @@ Forwarded: not-needed
 
 --- gpac.orig/configure
 +++ gpac/configure
-@@ -1329,7 +1329,7 @@ for opt do
+@@ -312,7 +312,7 @@ for opt do
              ;;
-         --disable-alsa=*) has_alsa="no"
+         --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
              ;;
 -        --enable-debug) debuginfo="yes"; no_gcc_opt="yes"
 +        --enable-debug) debuginfo="yes";
              ;;
-         --enable-gprof) gprof_build="yes";
+         --disable-opt) no_gcc_opt="yes"
              ;;
-@@ -1643,13 +1643,9 @@ fi
+@@ -594,13 +594,9 @@ fi
  
  #GCC opt
  if test "$no_gcc_opt" = "no"; then
@@ -31,4 +31,4 @@ Forwarded: not-needed
 +    CFLAGS="-O0 $CFLAGS"
  fi
  
- #look for DX support
+ 

diff --git a/debian/patches/mp4box-manpage-fix.patch b/debian/patches/mp4box-manpage-fix.patch
index 87bcfc6bb9cecfccf923b20fc67fa990ca2ecd94..0e906492719ef422fafab7ed7be799255a1baf5a 100644 (file)
--- a/debian/patches/mp4box-manpage-fix.patch
+++ b/debian/patches/mp4box-manpage-fix.patch
@@ -6,7 +6,7 @@ Origin: http://git.debian.org/?p=pkg-multimedia/gpac.git;a=blob;f=debian/patches
 
 --- gpac.orig/doc/man/mp4box.1
 +++ gpac/doc/man/mp4box.1
-@@ -390,7 +390,7 @@ decrypts a specific track using ISMA AES
+@@ -393,7 +393,7 @@ decrypts a specific track using ISMA AES
  .B \-set-kms [tkID=]kms_uri
  changes KMS location for all tracks or a given one if tkID is specified.
  .TP
@@ -15,7 +15,7 @@ Origin: http://git.debian.org/?p=pkg-multimedia/gpac.git;a=blob;f=debian/patches
  File is XML and shall start with xml header. File root is an "ISMACryp" element. File is a list of "ISMACrypTrack" elements. 
  .br
  ISMACrypTrack attributes:
-@@ -617,7 +617,7 @@ source of updates - default: null.
+@@ -620,7 +620,7 @@ source of updates - default: null.
  .B \-rap=TIME
  duration in ms of base carousel - default: 0 (off). you can specify the RAP period of a single ESID (not in DIMS) with -rap=ESID=X:time.
  .TP

diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
index 69f34dbc65dd51ca82881bda951ba151863a386a..e633021bb7a77a3fb093f571571a0ad54a905e6e 100644 (file)
--- a/debian/patches/multiarch.patch
+++ b/debian/patches/multiarch.patch
@@ -9,7 +9,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841
 
 --- gpac.orig/configure
 +++ gpac/configure
-@@ -271,6 +271,8 @@ for opt do
+@@ -292,6 +292,8 @@ for opt do
      case "$opt" in
          --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
              ;;
@@ -18,7 +18,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841
          --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
              ;;
          --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-@@ -313,9 +315,6 @@ case "$cpu" in
+@@ -340,9 +342,6 @@ case "$cpu" in
          if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
              if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
                  cpu="x86_64"
@@ -28,7 +28,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841
                  want_pic="yes"
              fi
          fi
-@@ -328,7 +327,6 @@ case "$cpu" in
+@@ -355,7 +354,6 @@ case "$cpu" in
          ;;
      ppc64)
          cpu="powerpc"
@@ -36,7 +36,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841
          ;;  
      "Power Macintosh"|ppc)
          cpu="powerpc"
-@@ -2066,6 +2064,7 @@ echo "# Automatically generated by confi
+@@ -2310,6 +2308,7 @@ echo "# Automatically generated by confi
  echo "GPAC_CONFIGURATION=$GPAC_CONFIGURATION" >> config.mak
  
  echo "prefix=$prefix" >> config.mak
@@ -44,7 +44,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=841
  echo "DESTDIR=$DESTDIR" >> config.mak
  echo "moddir=$prefix/$libdir/gpac" >> config.mak
  echo "moddir_path=$prefix/$libdir/gpac" >> config.mak
-@@ -2082,7 +2081,6 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak
+@@ -2326,7 +2325,6 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak
  echo "CPPFLAGS=$CPPFLAGS" >> config.mak
  echo "LDFLAGS=$LDFLAGS" >> config.mak
  echo "SHFLAGS=$SHFLAGS" >> config.mak

diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
index 01f8a37a8b07c6a4b863da6d5d136efc73a479bd..e9219e5cbb7d8ac5ea75217502ebfad3219590df 100644 (file)
--- a/debian/patches/soname-fix.patch
+++ b/debian/patches/soname-fix.patch
@@ -10,8 +10,8 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
 
 --- gpac.orig/configure
 +++ gpac/configure
-@@ -1769,6 +1769,10 @@ echo "#define GPAC_CONFIGURATION \"$GPAC
- 
+@@ -2011,6 +2011,10 @@ echo "#define GF_CONFIG_H" >> $TMPH
+ echo "#define GPAC_CONFIGURATION \"$GPAC_CONFIGURATION\"" >> $TMPH
  
  version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/tools.h\" | cut -d '"' -f 2`"
 +version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'`
@@ -21,7 +21,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  
  if which svnversion >/dev/null
  then
-@@ -2107,6 +2111,9 @@ if test "$bigendian" = "yes" ; then
+@@ -2351,6 +2355,9 @@ if test "$bigendian" = "yes" ; then
  fi
  echo "EXTRALIBS=$extralibs" >> config.mak
  echo "VERSION=$version" >>config.mak
@@ -31,7 +31,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  
  if test "$use_fixed_point" = "yes"; then
      echo "#define GPAC_FIXED_POINT" >> $TMPH
-@@ -2149,6 +2156,7 @@ else
+@@ -2393,6 +2400,7 @@ else
  fi
  
  if test "$win32" = "no" ; then
@@ -41,7 +41,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  else
 --- gpac.orig/Makefile
 +++ gpac/Makefile
-@@ -106,8 +106,9 @@ ifeq ($(CONFIG_DARWIN),yes)
+@@ -107,8 +107,9 @@ ifeq ($(CONFIG_DARWIN),yes)
        $(INSTALL) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION).$(DYN_LIB_SUFFIX)
        ln -sf libgpac.$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
  else
@@ -64,7 +64,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  ifeq ($(CONFIG_DARWIN), yes)
  LD_SONAME=
  endif
-@@ -209,6 +209,10 @@ else
+@@ -210,6 +210,10 @@ else
        ar cr ../bin/gcc/libgpac_static.a $(OBJS)
        ranlib ../bin/gcc/libgpac_static.a
        $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
@@ -75,7 +75,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  endif
  
  dep: depend
-@@ -219,7 +223,8 @@ depend:
+@@ -220,7 +224,8 @@ depend:
  
  clean: 
        rm -f $(OBJS) ../bin/gcc/$(LIB)