[Pkg-sdl-commits] [smpeg] 01/03: Prepare for new release
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Jan 21 13:11:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch experimental
in repository smpeg.
commit 607232d20e874d24242a02bf59f486bf854806dd
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Thu Jan 21 14:07:36 2016 +0100
Prepare for new release
---
debian/changelog | 20 +++++
debian/control | 25 ++----
debian/libsmpeg-dev.install | 10 +--
debian/libsmpeg-dev.manpages | 2 +-
debian/libsmpeg0.install | 1 -
debian/libsmpeg1.install | 1 +
debian/patches/001_gtk+2.0-headers.diff | 13 ---
debian/patches/005_link_with_g++.diff | 11 ---
debian/patches/010_fix_m4_syntax.diff | 107 -------------------------
debian/patches/020_libx11.diff | 25 ------
debian/patches/030_am_prog_as.diff | 12 ---
debian/patches/200_export_mpegaudio_class.diff | 10 ++-
debian/patches/210_gtk+2.0-code.diff | 75 -----------------
debian/patches/300_manpage_typos.diff | 22 -----
debian/patches/310_deprecate_flags.diff | 8 +-
debian/patches/320_gnu_stack.diff | 14 ++--
debian/patches/330_format_security.diff | 14 ----
debian/patches/fix-build.patch | 12 +++
debian/patches/ltconfig_for_kfreebsd.diff | 11 ---
debian/patches/series | 12 +--
debian/patches/upstream_disable_rpath.diff | 48 -----------
debian/rules | 4 +-
debian/smpeg-gtv.install | 2 -
debian/smpeg-gtv.menu | 5 --
debian/smpeg-gtv.mime | 2 -
debian/{smpeg-config.1 => smpeg2-config.1} | 0
26 files changed, 66 insertions(+), 400 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 94828e7..bc0c207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+smpeg2 (2.0.0~svn412-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Drop gtv package, dropped upstream.
+ * Drop patches addressed upstream:
+ - 001_gtk+2.0-headers.diff
+ - 005_link_with_g++.diff
+ - 010_fix_m4_syntax.diff
+ - 020_libx11.diff
+ - 030_am_prog_as.diff
+ - 210_gtk+2.0-code.diff
+ - 300_manpage_typos.diff
+ - 330_format_security.diff
+ - ltconfig_for_kfreebsd.diff
+ - upstream_disable_rpath.diff
+ * Rename package and libraries to smpeg2.
+ * Move the build to libsdl2
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 21 Jan 2016 13:10:13 +0100
+
smpeg (0.4.5+cvs20030824-7) unstable; urgency=medium
* Patch ltconfig to add support for kfreebsd-*, otherwise FTBFS. Thanks
diff --git a/debian/control b/debian/control
index 7bfa628..4eff8a9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: smpeg
+Source: smpeg2
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
Uploaders: Manuel A. Fernandez Montecelo <mafm at debian.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
Section: libs
@@ -6,15 +6,15 @@ Priority: optional
Build-Depends: debhelper (>= 9~),
dh-autoreconf,
chrpath,
- libsdl1.2-dev (>= 1.2.2-3.1),
+ libsdl2-dev,
libgtk2.0-dev,
libglib2.0-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/smpeg.git
Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/smpeg.git
Homepage: http://icculus.org/smpeg/
-Package: libsmpeg0
+Package: libsmpeg1
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -22,7 +22,6 @@ Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: smpeg,
libsmpeg-dev (<= 0.3.5-1),
- smpeg-gtv (<= 0.3.5-1),
smpeg-plaympeg (<= 0.3.5-1),
libsmpeg0c2
Provides: libsmpeg0c2
@@ -40,7 +39,7 @@ Description: SDL MPEG Player Library - shared libraries
Package: libsmpeg-dev
Architecture: any
Section: libdevel
-Depends: libsmpeg0 (= ${binary:Version}),
+Depends: libsmpeg1 (= ${binary:Version}),
${misc:Depends},
libsdl1.2-dev (>= 1.2.2-3.3)
Description: SDL MPEG Player Library - development files
@@ -67,17 +66,3 @@ Description: SMPEG command line MPEG audio/video player
MPEG-1 video, and MPEG system streams.
.
This package contains a command line player called plaympeg.
-
-Package: smpeg-gtv
-Architecture: any
-Section: video
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: SMPEG GTK+ MPEG audio/video player
- SMPEG (SDL MPEG Player Library) is a free MPEG1 video player library with
- sound support. Video playback is based on the ubiquitous Berkeley MPEG
- player, mpeg_play v2.2. Audio is played through a slightly modified
- mpegsound library, part of splay v0.8.2. SMPEG supports MPEG audio (MP3),
- MPEG-1 video, and MPEG system streams.
- .
- This package contains a GTK+ player called gtv.
diff --git a/debian/libsmpeg-dev.install b/debian/libsmpeg-dev.install
index 421dec0..4335dfc 100644
--- a/debian/libsmpeg-dev.install
+++ b/debian/libsmpeg-dev.install
@@ -1,5 +1,5 @@
-usr/bin/smpeg-config
-usr/include/smpeg
-usr/lib/*/libsmpeg.a
-usr/lib/*/libsmpeg.so
-usr/share/aclocal/smpeg.m4
+usr/bin/smpeg2-config
+usr/include/smpeg2
+usr/lib/*/libsmpeg2.a
+usr/lib/*/libsmpeg2.so
+usr/share/aclocal/smpeg2.m4
diff --git a/debian/libsmpeg-dev.manpages b/debian/libsmpeg-dev.manpages
index 72c1151..e493a96 100644
--- a/debian/libsmpeg-dev.manpages
+++ b/debian/libsmpeg-dev.manpages
@@ -1 +1 @@
-debian/smpeg-config.1
+debian/smpeg2-config.1
diff --git a/debian/libsmpeg0.install b/debian/libsmpeg0.install
deleted file mode 100644
index 828cb29..0000000
--- a/debian/libsmpeg0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libsmpeg-0.4.so.0*
diff --git a/debian/libsmpeg1.install b/debian/libsmpeg1.install
new file mode 100644
index 0000000..44c7e7b
--- /dev/null
+++ b/debian/libsmpeg1.install
@@ -0,0 +1 @@
+usr/lib/*/libsmpeg2-*.so.0*
diff --git a/debian/patches/001_gtk+2.0-headers.diff b/debian/patches/001_gtk+2.0-headers.diff
deleted file mode 100644
index 5ba98ce..0000000
--- a/debian/patches/001_gtk+2.0-headers.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: smpeg-0.4.5+cvs20030824/configure.in
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/configure.in 2007-06-21 04:06:54.000000000 +0200
-+++ smpeg-0.4.5+cvs20030824/configure.in 2007-06-21 04:07:11.000000000 +0200
-@@ -210,7 +210,7 @@
- , enable_gtk_player=yes)
- have_gtk=no
- if test x$enable_gtk_player = xyes; then
-- AM_PATH_GTK(1.2.1, have_gtk=yes)
-+ AM_PATH_GTK_2_0(2.0.0, have_gtk=yes)
- if test x$have_gtk = xyes; then
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- fi
diff --git a/debian/patches/005_link_with_g++.diff b/debian/patches/005_link_with_g++.diff
deleted file mode 100644
index e10c3b6..0000000
--- a/debian/patches/005_link_with_g++.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- smpeg-0.4.5+cvs20030824.orig/Makefile.am
-+++ smpeg-0.4.5+cvs20030824/Makefile.am
-@@ -4,7 +4,7 @@
- # These are the subdirectories that are always built
- SUBDIRS = audio video
-
--CXXLD = cc
-+CXXLD = g++
-
- bin_SCRIPTS = smpeg-config
-
diff --git a/debian/patches/010_fix_m4_syntax.diff b/debian/patches/010_fix_m4_syntax.diff
deleted file mode 100644
index ae86857..0000000
--- a/debian/patches/010_fix_m4_syntax.diff
+++ /dev/null
@@ -1,107 +0,0 @@
---- smpeg-0.4.5+cvs20030824.orig/smpeg.m4
-+++ smpeg-0.4.5+cvs20030824/smpeg.m4
-@@ -6,20 +6,25 @@
- # stolen from Manish Singh
- # Shamelessly stolen from Owen Taylor
-
--dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [,
--ACTION-IF-NOT-FOUND]]])
-+dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
- dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
- dnl
--AC_DEFUN(AM_PATH_SMPEG,
-+AC_DEFUN([AM_PATH_SMPEG],
- [dnl
- dnl Get the cflags and libraries from the smpeg-config script
- dnl
--AC_ARG_WITH(smpeg-prefix,[ --with-smpeg-prefix=PFX Prefix where SMPEG is installed (optional)],
-- smpeg_prefix="$withval", smpeg_prefix="")
--AC_ARG_WITH(smpeg-exec-prefix,[ --with-smpeg-exec-prefix=PFX Exec prefix where SMPEG is installed (optional)],
-- smpeg_exec_prefix="$withval", smpeg_exec_prefix="")
--AC_ARG_ENABLE(smpegtest, [ --disable-smpegtest Do not try to compile and run a test SMPEG program],
-- , enable_smpegtest=yes)
-+AC_ARG_WITH([smpeg-prefix],
-+ AS_HELP_STRING([--with-smpeg-prefix=PFX],
-+ [Prefix where SMPEG is installed (optional)]),
-+ [smpeg_prefix="$withval"], [smpeg_prefix=""])
-+AC_ARG_WITH([smpeg-exec-prefix],
-+ AS_HELP_STRING([--with-smpeg-exec-prefix=PFX],
-+ [Exec prefix where SMPEG is installed (optional)]),
-+ [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""])
-+AC_ARG_ENABLE([smpegtest],
-+ AS_HELP_STRING([--disable-smpegtest],
-+ [Do not try to compile and run a test SMPEG program]),
-+ [], [enable_smpegtest=yes])
-
- if test x$smpeg_exec_prefix != x ; then
- smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix"
-@@ -34,9 +39,9 @@
- fi
- fi
-
-- AC_PATH_PROG(SMPEG_CONFIG, smpeg-config, no)
-- min_smpeg_version=ifelse([$1], ,0.2.7,$1)
-- AC_MSG_CHECKING(for SMPEG - version >= $min_smpeg_version)
-+ AC_PATH_PROG([SMPEG_CONFIG], [smpeg-config], [no])
-+ min_smpeg_version=ifelse([$1], [], [0.2.7], [$1])
-+ AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version])
- no_smpeg=""
- if test "$SMPEG_CONFIG" = "no" ; then
- no_smpeg=yes
-@@ -60,7 +65,7 @@
- dnl checks the results of smpeg-config to some extent
- dnl
- rm -f conf.smpegtest
-- AC_TRY_RUN([
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -117,16 +122,16 @@
- }
- }
-
--],, no_smpeg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_smpeg" = x ; then
-- AC_MSG_RESULT(yes)
-- ifelse([$2], , :, [$2])
-+ AC_MSG_RESULT([yes])
-+ ifelse([$2], [], [:], [$2])
- else
-- AC_MSG_RESULT(no)
-+ AC_MSG_RESULT([no])
- if test "$SMPEG_CONFIG" = "no" ; then
- echo "*** The smpeg-config script installed by SMPEG could not be found"
- echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -139,10 +144,11 @@
- echo "*** Could not run SMPEG test program, checking why..."
- CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
-- AC_TRY_LINK([
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
- #include "smpeg.h"
--], [ return 0; ],
-+]],
-+ [[ return 0; ]])],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SMPEG or finding the wrong"
- echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your"
-@@ -162,9 +168,9 @@
- fi
- SMPEG_CFLAGS=""
- SMPEG_LIBS=""
-- ifelse([$3], , :, [$3])
-+ ifelse([$3], [], [:], [$3])
- fi
-- AC_SUBST(SMPEG_CFLAGS)
-- AC_SUBST(SMPEG_LIBS)
-+ AC_SUBST([SMPEG_CFLAGS])
-+ AC_SUBST([SMPEG_LIBS])
- rm -f conf.smpegtest
- ])
diff --git a/debian/patches/020_libx11.diff b/debian/patches/020_libx11.diff
deleted file mode 100644
index 8611073..0000000
--- a/debian/patches/020_libx11.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: smpeg-0.4.5+cvs20030824/Makefile.am
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/Makefile.am
-+++ smpeg-0.4.5+cvs20030824/Makefile.am
-@@ -74,7 +74,7 @@
-
- # Sources for gtv
- gtv_SOURCES = gtv.c gtv.h
--gtv_LDADD = @GTK_LIBS@ libsmpeg.la
-+gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la
-
- # Sources for glmovie
- glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h
-Index: smpeg-0.4.5+cvs20030824/configure.in
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/configure.in
-+++ smpeg-0.4.5+cvs20030824/configure.in
-@@ -215,6 +215,7 @@
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- fi
- AC_SUBST(GTK_LIBS)
-+ PKG_CHECK_MODULES([X11], [x11])
- fi
- AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)
-
diff --git a/debian/patches/030_am_prog_as.diff b/debian/patches/030_am_prog_as.diff
deleted file mode 100644
index 36197d7..0000000
--- a/debian/patches/030_am_prog_as.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: smpeg-0.4.5+cvs20030824/configure.in
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/configure.in
-+++ smpeg-0.4.5+cvs20030824/configure.in
-@@ -57,6 +57,7 @@
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
- AC_PROG_INSTALL
-+AM_PROG_AS
-
- dnl Ugh.
- AS="$CC"
diff --git a/debian/patches/200_export_mpegaudio_class.diff b/debian/patches/200_export_mpegaudio_class.diff
index 9ecb9b5..000364b 100644
--- a/debian/patches/200_export_mpegaudio_class.diff
+++ b/debian/patches/200_export_mpegaudio_class.diff
@@ -1,6 +1,8 @@
---- smpeg-0.4.5+cvs20030824.orig/MPEGaudio.h
-+++ smpeg-0.4.5+cvs20030824/MPEGaudio.h
-@@ -149,6 +149,14 @@
+Index: smpeg/MPEGaudio.h
+===================================================================
+--- smpeg.orig/MPEGaudio.h
++++ smpeg/MPEGaudio.h
+@@ -153,6 +153,14 @@
};
/* The actual MPEG audio class */
@@ -14,4 +16,4 @@
+
class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+ public:
diff --git a/debian/patches/210_gtk+2.0-code.diff b/debian/patches/210_gtk+2.0-code.diff
deleted file mode 100644
index 8e1da50..0000000
--- a/debian/patches/210_gtk+2.0-code.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: smpeg-0.4.5+cvs20030824/gtv.c
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/gtv.c 2007-06-21 04:14:30.000000000 +0200
-+++ smpeg-0.4.5+cvs20030824/gtv.c 2007-06-21 10:58:53.000000000 +0200
-@@ -850,7 +850,7 @@
-
- assert( raw );
- assert( value >= 0 );
-- if(gtv_trackbar_dragging) return;
-+ //if(gtv_trackbar_dragging) return;
-
- mpeg = (SMPEG*) gtk_object_get_data( GTK_OBJECT( raw ), "mpeg" );
- info = (SMPEG_Info*) gtk_object_get_data( GTK_OBJECT( raw ), "info" );
-@@ -860,9 +860,10 @@
- seek = gtk_range_get_adjustment ( GTK_RANGE( scale ) );
- seek->value = 100. * value / info->total_size;
- gtk_range_set_adjustment ( GTK_RANGE( scale ), seek );
-- gtk_range_slider_update ( GTK_RANGE( scale ) );
-- gtk_range_clear_background ( GTK_RANGE( scale ) );
-- gtk_range_draw_background ( GTK_RANGE( scale ) );
-+ gtk_adjustment_changed ( seek );
-+ //gtk_range_slider_update ( GTK_RANGE( scale ) );
-+ //gtk_range_clear_background ( GTK_RANGE( scale ) );
-+ //gtk_range_draw_background ( GTK_RANGE( scale ) );
- }
- }
-
-@@ -1021,7 +1022,7 @@
- GtkWidget *menubar1;
- GtkWidget *file;
- GtkWidget *file_menu;
-- GtkAccelGroup *file_menu_accels;
-+ //GtkAccelGroup *file_menu_accels;
- GtkWidget *open;
- GtkWidget *close;
- GtkWidget *separator1;
-@@ -1030,7 +1031,7 @@
- GtkWidget *quit;
- GtkWidget *help;
- GtkWidget *help_menu;
-- GtkAccelGroup *help_menu_accels;
-+ //GtkAccelGroup *help_menu_accels;
- GtkWidget *about;
- GtkWidget *table1;
- GtkObject *seek;
-@@ -1083,7 +1084,7 @@
- gtk_object_set_data_full (GTK_OBJECT (gtv_window), "file_menu", file_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (file), file_menu);
-- file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
-+ //file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
-
- open = gtk_menu_item_new_with_label ("Open");
- gtk_widget_ref (open);
-@@ -1154,7 +1155,7 @@
- gtk_object_set_data_full (GTK_OBJECT (gtv_window), "help_menu", help_menu,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (help), help_menu);
-- help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_menu));
-+ //help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_menu));
-
- about = gtk_menu_item_new_with_label ("About");
- gtk_widget_ref (about);
-Index: smpeg-0.4.5+cvs20030824/gtv.h
-===================================================================
---- smpeg-0.4.5+cvs20030824.orig/gtv.h 2007-06-21 04:14:47.000000000 +0200
-+++ smpeg-0.4.5+cvs20030824/gtv.h 2007-06-21 04:14:55.000000000 +0200
-@@ -1,6 +1,7 @@
- #ifndef GTV_H
- #define GTV_H
-
-+#define GTK_ENABLE_BROKEN
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <assert.h>
diff --git a/debian/patches/300_manpage_typos.diff b/debian/patches/300_manpage_typos.diff
deleted file mode 100644
index 2428d63..0000000
--- a/debian/patches/300_manpage_typos.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- smpeg-0.4.5+cvs20030824.orig/gtv.1
-+++ smpeg-0.4.5+cvs20030824/gtv.1
-@@ -15,7 +15,7 @@
- The video player works best on a 16 bit color depth X11 display,
- it works on other color depths with reduced speed as well. You'll need a
- CPU with 300 MHz or more to play back an MPEG system stream with 25 frames
--per secons (fps) at full speed.
-+per seconds (fps) at full speed.
-
- .SH "SEE ALSO"
- SMPEG home page at http://www.lokigames.com/development/smpeg.php3
---- smpeg-0.4.5+cvs20030824.orig/plaympeg.1
-+++ smpeg-0.4.5+cvs20030824/plaympeg.1
-@@ -15,7 +15,7 @@
- The video player works best on a 16 bit color depth X11 display,
- it works on other color depths with reduced speed as well. You'll need a
- CPU with 300 MHz or more to play back an MPEG system stream with 25 frames
--per secons (fps) at full speed.
-+per seconds (fps) at full speed.
-
- .SH OPTIONS
- .TP
diff --git a/debian/patches/310_deprecate_flags.diff b/debian/patches/310_deprecate_flags.diff
index 6c0eb89..722a2a2 100644
--- a/debian/patches/310_deprecate_flags.diff
+++ b/debian/patches/310_deprecate_flags.diff
@@ -1,8 +1,10 @@
---- smpeg-0.4.5+cvs20030824.orig/smpeg-config.in
-+++ smpeg-0.4.5+cvs20030824/smpeg-config.in
+Index: smpeg/smpeg2-config.in
+===================================================================
+--- smpeg.orig/smpeg2-config.in
++++ smpeg/smpeg2-config.in
@@ -52,6 +52,14 @@
fi
- echo $libdirs -lsmpeg `@SDL_CONFIG@ --libs`
+ echo $libdirs -lsmpeg2 `@SDL_CONFIG@ --libs`
;;
+ --library-libs)
+ echo "Please update to a new smpeg.m4. --library-libs is no longer"
diff --git a/debian/patches/320_gnu_stack.diff b/debian/patches/320_gnu_stack.diff
index be50437..ae8cf27 100644
--- a/debian/patches/320_gnu_stack.diff
+++ b/debian/patches/320_gnu_stack.diff
@@ -1,14 +1,18 @@
---- smpeg-0.4.5+cvs20030824.orig/video/mmxflags_asm.S
-+++ smpeg-0.4.5+cvs20030824/video/mmxflags_asm.S
+Index: smpeg/video/mmxflags_asm.S
+===================================================================
+--- smpeg.orig/video/mmxflags_asm.S
++++ smpeg/video/mmxflags_asm.S
@@ -1,4 +1,6 @@
+.section .note.GNU-stack,"",%progbits
+
#if defined(i386) && defined(USE_MMX)
- .data
---- smpeg-0.4.5+cvs20030824.orig/video/mmxidct_asm.S
-+++ smpeg-0.4.5+cvs20030824/video/mmxidct_asm.S
+ .text
+Index: smpeg/video/mmxidct_asm.S
+===================================================================
+--- smpeg.orig/video/mmxidct_asm.S
++++ smpeg/video/mmxidct_asm.S
@@ -1,4 +1,5 @@
+.section .note.GNU-stack,"",%progbits
diff --git a/debian/patches/330_format_security.diff b/debian/patches/330_format_security.diff
deleted file mode 100644
index 7ea4787..0000000
--- a/debian/patches/330_format_security.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS with -Werror=format-security.
-Author: Felix Geyer <debfx-pkg at fobos.de>
-
---- smpeg-0.4.5+cvs20030824.orig/plaympeg.c
-+++ smpeg-0.4.5+cvs20030824/plaympeg.c
-@@ -262,7 +262,7 @@ int ftp_get_reply(int tcp_sock)
- answer[i] = c;
- }
- answer[i] = 0;
-- fprintf(stderr, answer + 4);
-+ fprintf(stderr, "%s", answer + 4);
- }
- while(answer[3] == '-');
-
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
new file mode 100644
index 0000000..910b8d9
--- /dev/null
+++ b/debian/patches/fix-build.patch
@@ -0,0 +1,12 @@
+--- smpeg2-2.0.0~svn412.orig/configure.in
++++ smpeg2-2.0.0~svn412/configure.in
+@@ -58,9 +58,6 @@ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+
+-dnl Work around the lack of certain typedefs.
+-AC_TYPE_SOCKLEN_T
+-
+ dnl The alpha architecture needs special flags for binary portability
+ case "$target" in
+ alpha*-*-linux*)
diff --git a/debian/patches/ltconfig_for_kfreebsd.diff b/debian/patches/ltconfig_for_kfreebsd.diff
deleted file mode 100644
index 70c4312..0000000
--- a/debian/patches/ltconfig_for_kfreebsd.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ltconfig
-+++ b/ltconfig
-@@ -1973,7 +1973,7 @@
- esac
- ;;
-
--gnu*)
-+gnu* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/debian/patches/series b/debian/patches/series
index a602784..9664ffc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,4 @@
-#000_no_rpath.diff
-ltconfig_for_kfreebsd.diff
-upstream_disable_rpath.diff
-001_gtk+2.0-headers.diff
-005_link_with_g++.diff
-010_fix_m4_syntax.diff
-020_libx11.diff
-030_am_prog_as.diff
200_export_mpegaudio_class.diff
-210_gtk+2.0-code.diff
-300_manpage_typos.diff
310_deprecate_flags.diff
320_gnu_stack.diff
-330_format_security.diff
+fix-build.patch
diff --git a/debian/patches/upstream_disable_rpath.diff b/debian/patches/upstream_disable_rpath.diff
deleted file mode 100644
index b751f27..0000000
--- a/debian/patches/upstream_disable_rpath.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Add to support disabling rpath in ./configure
- http://icculus.org/pipermail/smpeg/2010-November/000183.html
-Author: Michael Smith <msmith at cbnco.com>
-Last-Update: 2014-08-09
-Applied-Upstream: http://svn.icculus.org/smpeg?view=rev&revision=390
-
---- trunk/configure.in 2009/10/18 06:08:35 389
-+++ trunk/configure.in 2010/12/31 00:16:25 390
-@@ -84,19 +84,27 @@
- ;;
- esac
-
--# Set runtime shared library paths as needed
-+dnl Set runtime shared library paths as needed
-+AC_ARG_ENABLE(rpath,
-+ AC_HELP_STRING([--enable-rpath],
-+ [use an rpath when linking SDL [[default=yes]]]),,
-+ enable_rpath=yes)
-
--case "$target" in
-- *-*-linux*)
-- SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
-- ;;
-- *-*-freebsd*)
-- SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
-- ;;
-- *-*-solaris*)
-- SMPEG_RLD_FLAGS="-R\${exec_prefix}/lib"
-- ;;
--esac
-+if test "x$enable_rpath" = "xyes"; then
-+ case "$target" in
-+ *-*-linux*)
-+ SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
-+ ;;
-+ *-*-freebsd*)
-+ SMPEG_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
-+ ;;
-+ *-*-solaris*)
-+ SMPEG_RLD_FLAGS="-R\${exec_prefix}/lib"
-+ ;;
-+ esac
-+else
-+ SMPEG_RLD_FLAGS=""
-+fi
-
- AC_SUBST(SMPEG_RLD_FLAGS)
-
diff --git a/debian/rules b/debian/rules
index 57ccd0c..ce50f47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,4 @@ override_dh_auto_configure:
dh_auto_configure -- --enable-mmx=no --enable-opengl-player=no --enable-rpath=no
override_dh_install:
- chrpath --delete debian/tmp/usr/bin/gtv debian/tmp/usr/bin/plaympeg
-
- dh_install --fail-missing -Xlibsmpeg.la
+ dh_install --fail-missing -Xlibsmpeg2.la
diff --git a/debian/smpeg-gtv.install b/debian/smpeg-gtv.install
deleted file mode 100644
index fd2c257..0000000
--- a/debian/smpeg-gtv.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/gtv
-usr/share/man/man1/gtv.1
diff --git a/debian/smpeg-gtv.menu b/debian/smpeg-gtv.menu
deleted file mode 100644
index 35fec51..0000000
--- a/debian/smpeg-gtv.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(smpeg-gtv):\
- needs="x11"\
- section="Applications/Viewers"\
- title="gtv MPEG player"\
- command="/usr/bin/gtv"
diff --git a/debian/smpeg-gtv.mime b/debian/smpeg-gtv.mime
deleted file mode 100644
index 36d543c..0000000
--- a/debian/smpeg-gtv.mime
+++ /dev/null
@@ -1,2 +0,0 @@
-audio/mpeg; /usr/bin/gtv '%s'; description="MPEG audio files"; test=test -n "$DISPLAY"; priority=2
-video/mpeg; /usr/bin/gtv '%s'; description="MPEG video files"; test=test -n "$DISPLAY"; priority=7
diff --git a/debian/smpeg-config.1 b/debian/smpeg2-config.1
similarity index 100%
rename from debian/smpeg-config.1
rename to debian/smpeg2-config.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/smpeg.git
More information about the pkg-sdl-commits
mailing list