Codebase list smpeg / 8454558
Remove smpeg-gtv package. * Remove smpeg-gtv package. - Depends on the deprecated GTK 2 library. - Remove gtk-related patches. - Closes: #967749 Felix Geyer 3 years ago
9 changed file(s) with 37 addition(s) and 136 deletion(s). Raw diff Collapse all Expand all
0 smpeg (0.4.5+cvs20030824-9) UNRELEASED; urgency=medium
1
2 * Remove smpeg-gtv package.
3 - Depends on the deprecated GTK 2 library.
4 - Remove gtk-related patches.
5 - Closes: #967749
6
7 -- Felix Geyer <fgeyer@debian.org> Fri, 23 Oct 2020 00:30:33 +0200
8
09 smpeg (0.4.5+cvs20030824-8) unstable; urgency=medium
110
211 * Acknowledge NMUs
55 Rules-Requires-Root: no
66 Build-Depends: debhelper (>= 11~),
77 chrpath,
8 libsdl1.2-dev (>= 1.2.2-3.1),
9 libgtk2.0-dev,
10 libglib2.0-dev
8 libsdl1.2-dev (>= 1.2.2-3.1)
119 Standards-Version: 4.2.1
1210 Vcs-Browser: https://salsa.debian.org/sdl-team/smpeg
1311 Vcs-Git: https://salsa.debian.org/sdl-team/smpeg.git
6664 MPEG-1 video, and MPEG system streams.
6765 .
6866 This package contains a command line player called plaympeg.
69
70 Package: smpeg-gtv
71 Architecture: any
72 Section: video
73 Depends: ${shlibs:Depends},
74 ${misc:Depends}
75 Description: SMPEG GTK+ MPEG audio/video player
76 SMPEG (SDL MPEG Player Library) is a free MPEG1 video player library with
77 sound support. Video playback is based on the ubiquitous Berkeley MPEG
78 player, mpeg_play v2.2. Audio is played through a slightly modified
79 mpegsound library, part of splay v0.8.2. SMPEG supports MPEG audio (MP3),
80 MPEG-1 video, and MPEG system streams.
81 .
82 This package contains a GTK+ player called gtv.
0 usr/lib/*/libsmpeg.la
1 usr/share/man/man1/gtv.1
+0
-13
debian/patches/001_gtk+2.0-headers.diff less more
0 Index: smpeg-0.4.5+cvs20030824/configure.in
1 ===================================================================
2 --- smpeg-0.4.5+cvs20030824.orig/configure.in 2007-06-21 04:06:54.000000000 +0200
3 +++ smpeg-0.4.5+cvs20030824/configure.in 2007-06-21 04:07:11.000000000 +0200
4 @@ -210,7 +210,7 @@
5 , enable_gtk_player=yes)
6 have_gtk=no
7 if test x$enable_gtk_player = xyes; then
8 - AM_PATH_GTK(1.2.1, have_gtk=yes)
9 + AM_PATH_GTK_2_0(2.0.0, have_gtk=yes)
10 if test x$have_gtk = xyes; then
11 CFLAGS="$CFLAGS $GTK_CFLAGS"
12 fi
+0
-25
debian/patches/020_libx11.diff less more
0 Index: smpeg-0.4.5+cvs20030824/Makefile.am
1 ===================================================================
2 --- smpeg-0.4.5+cvs20030824.orig/Makefile.am
3 +++ smpeg-0.4.5+cvs20030824/Makefile.am
4 @@ -74,7 +74,7 @@
5
6 # Sources for gtv
7 gtv_SOURCES = gtv.c gtv.h
8 -gtv_LDADD = @GTK_LIBS@ libsmpeg.la
9 +gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la
10
11 # Sources for glmovie
12 glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h
13 Index: smpeg-0.4.5+cvs20030824/configure.in
14 ===================================================================
15 --- smpeg-0.4.5+cvs20030824.orig/configure.in
16 +++ smpeg-0.4.5+cvs20030824/configure.in
17 @@ -215,6 +215,7 @@
18 CFLAGS="$CFLAGS $GTK_CFLAGS"
19 fi
20 AC_SUBST(GTK_LIBS)
21 + PKG_CHECK_MODULES([X11], [x11])
22 fi
23 AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)
24
+0
-75
debian/patches/210_gtk+2.0-code.diff less more
0 Index: smpeg-0.4.5+cvs20030824/gtv.c
1 ===================================================================
2 --- smpeg-0.4.5+cvs20030824.orig/gtv.c 2007-06-21 04:14:30.000000000 +0200
3 +++ smpeg-0.4.5+cvs20030824/gtv.c 2007-06-21 10:58:53.000000000 +0200
4 @@ -850,7 +850,7 @@
5
6 assert( raw );
7 assert( value >= 0 );
8 - if(gtv_trackbar_dragging) return;
9 + //if(gtv_trackbar_dragging) return;
10
11 mpeg = (SMPEG*) gtk_object_get_data( GTK_OBJECT( raw ), "mpeg" );
12 info = (SMPEG_Info*) gtk_object_get_data( GTK_OBJECT( raw ), "info" );
13 @@ -860,9 +860,10 @@
14 seek = gtk_range_get_adjustment ( GTK_RANGE( scale ) );
15 seek->value = 100. * value / info->total_size;
16 gtk_range_set_adjustment ( GTK_RANGE( scale ), seek );
17 - gtk_range_slider_update ( GTK_RANGE( scale ) );
18 - gtk_range_clear_background ( GTK_RANGE( scale ) );
19 - gtk_range_draw_background ( GTK_RANGE( scale ) );
20 + gtk_adjustment_changed ( seek );
21 + //gtk_range_slider_update ( GTK_RANGE( scale ) );
22 + //gtk_range_clear_background ( GTK_RANGE( scale ) );
23 + //gtk_range_draw_background ( GTK_RANGE( scale ) );
24 }
25 }
26
27 @@ -1021,7 +1022,7 @@
28 GtkWidget *menubar1;
29 GtkWidget *file;
30 GtkWidget *file_menu;
31 - GtkAccelGroup *file_menu_accels;
32 + //GtkAccelGroup *file_menu_accels;
33 GtkWidget *open;
34 GtkWidget *close;
35 GtkWidget *separator1;
36 @@ -1030,7 +1031,7 @@
37 GtkWidget *quit;
38 GtkWidget *help;
39 GtkWidget *help_menu;
40 - GtkAccelGroup *help_menu_accels;
41 + //GtkAccelGroup *help_menu_accels;
42 GtkWidget *about;
43 GtkWidget *table1;
44 GtkObject *seek;
45 @@ -1083,7 +1084,7 @@
46 gtk_object_set_data_full (GTK_OBJECT (gtv_window), "file_menu", file_menu,
47 (GtkDestroyNotify) gtk_widget_unref);
48 gtk_menu_item_set_submenu (GTK_MENU_ITEM (file), file_menu);
49 - file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
50 + //file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
51
52 open = gtk_menu_item_new_with_label ("Open");
53 gtk_widget_ref (open);
54 @@ -1154,7 +1155,7 @@
55 gtk_object_set_data_full (GTK_OBJECT (gtv_window), "help_menu", help_menu,
56 (GtkDestroyNotify) gtk_widget_unref);
57 gtk_menu_item_set_submenu (GTK_MENU_ITEM (help), help_menu);
58 - help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_menu));
59 + //help_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (help_menu));
60
61 about = gtk_menu_item_new_with_label ("About");
62 gtk_widget_ref (about);
63 Index: smpeg-0.4.5+cvs20030824/gtv.h
64 ===================================================================
65 --- smpeg-0.4.5+cvs20030824.orig/gtv.h 2007-06-21 04:14:47.000000000 +0200
66 +++ smpeg-0.4.5+cvs20030824/gtv.h 2007-06-21 04:14:55.000000000 +0200
67 @@ -1,6 +1,7 @@
68 #ifndef GTV_H
69 #define GTV_H
70
71 +#define GTK_ENABLE_BROKEN
72 #include <gtk/gtk.h>
73 #include <gdk/gdkkeysyms.h>
74 #include <assert.h>
0 Completely remove GTK check.
1
2 Works around failing autoreconf:
3 configure.in:221: error: possibly undefined macro: AM_PATH_GTK
4
5 --- a/configure.in
6 +++ b/configure.in
7 @@ -208,13 +208,6 @@ AC_ARG_ENABLE(gtk_player,
8 [ --enable-gtk-player build a GTk sample SMPEG player [default=yes]],
9 , enable_gtk_player=yes)
10 have_gtk=no
11 -if test x$enable_gtk_player = xyes; then
12 - AM_PATH_GTK(1.2.1, have_gtk=yes)
13 - if test x$have_gtk = xyes; then
14 - CFLAGS="$CFLAGS $GTK_CFLAGS"
15 - fi
16 - AC_SUBST(GTK_LIBS)
17 -fi
18 AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)
19
20 dnl See if we can build the Mesa player
00 #000_no_rpath.diff
11 ltconfig_for_kfreebsd.diff
22 upstream_disable_rpath.diff
3 001_gtk+2.0-headers.diff
43 005_link_with_g++.diff
54 010_fix_m4_syntax.diff
6 020_libx11.diff
75 030_am_prog_as.diff
86 040_drop_libtool.m4.diff
97 200_export_mpegaudio_class.diff
10 210_gtk+2.0-code.diff
118 300_manpage_typos.diff
129 310_deprecate_flags.diff
1310 320_gnu_stack.diff
1411 330_format_security.diff
1512 340_gcc6.diff
13 350_gtk_mssing_macro.diff
77 dh $@
88
99 override_dh_auto_configure:
10 dh_auto_configure -- --enable-mmx=no --enable-opengl-player=no --enable-rpath=no
10 dh_auto_configure -- --enable-mmx=no --enable-opengl-player=no --enable-gtk-player=no --enable-rpath=no
1111
1212 override_dh_install:
13 chrpath --delete debian/tmp/usr/bin/gtv debian/tmp/usr/bin/plaympeg
13 chrpath --delete debian/tmp/usr/bin/plaympeg
1414
1515 dh_install -Xlibsmpeg.la
1616
1717 override_dh_missing:
18 dh_missing --fail-missing -Xlibsmpeg.la
18 dh_missing --fail-missing