diff options
author | Alexander Larsson <alexl@redhat.com> | 2017-04-28 12:15:34 +0300 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2017-04-28 12:15:34 +0300 |
commit | 2c1f08e20282743249415d4e1ae47f6660e3c6db (patch) | |
tree | 0c5e5df279720d9e032bc94808a3eeded03f0788 /smpeg | |
parent | 41bb63d33531d2c3f5e77d012f5e8a6cd8bedda2 (diff) |
Add smpeg shared module
Diffstat (limited to 'smpeg')
-rw-r--r-- | smpeg/smpeg-0.4.5.json | 39 | ||||
-rw-r--r-- | smpeg/smpeg-am-prog-as.patch | 12 | ||||
-rw-r--r-- | smpeg/smpeg-export-mpegaudio-class.patch | 17 | ||||
-rw-r--r-- | smpeg/smpeg-gcc6.patch | 40 | ||||
-rw-r--r-- | smpeg/smpeg-no-gtk.patch | 37 |
5 files changed, 145 insertions, 0 deletions
diff --git a/smpeg/smpeg-0.4.5.json b/smpeg/smpeg-0.4.5.json new file mode 100644 index 0000000..a4d82aa --- /dev/null +++ b/smpeg/smpeg-0.4.5.json @@ -0,0 +1,39 @@ +{ + "name": "smpeg", + "config-opts": ["--disable-static"], + "cleanup": [ + "/bin", + "/man" + ], + "rm-configure": true, + "sources": [ + { + "type": "archive", + "url": "http://http.debian.net/debian/pool/main/s/smpeg/smpeg_0.4.5+cvs20030824.orig.tar.gz", + "sha256": "1276ea797dd9fde8a12dd3f33f180153922544c28ca9fc7b477c018876be1916" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "AUTOMAKE=\"automake --foreign --add-missing --force-missing\" autoreconf -vfi" + ] + }, + { + "type": "patch", + "path": "smpeg-am-prog-as.patch" + }, + { + "type": "patch", + "path": "smpeg-export-mpegaudio-class.patch" + }, + { + "type": "patch", + "path": "smpeg-no-gtk.patch" + }, + { + "type": "patch", + "path": "smpeg-gcc6.patch" + } + ] +} diff --git a/smpeg/smpeg-am-prog-as.patch b/smpeg/smpeg-am-prog-as.patch new file mode 100644 index 0000000..36197d7 --- /dev/null +++ b/smpeg/smpeg-am-prog-as.patch @@ -0,0 +1,12 @@ +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/smpeg/smpeg-export-mpegaudio-class.patch b/smpeg/smpeg-export-mpegaudio-class.patch new file mode 100644 index 0000000..9ecb9b5 --- /dev/null +++ b/smpeg/smpeg-export-mpegaudio-class.patch @@ -0,0 +1,17 @@ +--- smpeg-0.4.5+cvs20030824.orig/MPEGaudio.h ++++ smpeg-0.4.5+cvs20030824/MPEGaudio.h +@@ -149,6 +149,14 @@ + }; + + /* The actual MPEG audio class */ ++ ++class MPEGaudio; ++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); ++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); ++#ifdef THREADED_AUDIO ++int Decode_MPEGaudio(void *udata); ++#endif ++ + class MPEGaudio : public MPEGerror, public MPEGaudioaction { + + friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); diff --git a/smpeg/smpeg-gcc6.patch b/smpeg/smpeg-gcc6.patch new file mode 100644 index 0000000..21b30da --- /dev/null +++ b/smpeg/smpeg-gcc6.patch @@ -0,0 +1,40 @@ +Description: Fix compiling with GCC 6. +Author: Johannes Brandstätter <jbrandst@2ds.eu> +Bug-Debian: https://bugs.debian.org/811742 +Last-Update: <2016-09-24> + +Index: smpeg-0.4.5+cvs20030824/audio/huffmantable.cpp +=================================================================== +--- smpeg-0.4.5+cvs20030824.orig/audio/huffmantable.cpp ++++ smpeg-0.4.5+cvs20030824/audio/huffmantable.cpp +@@ -9,6 +9,7 @@ + #include "config.h" + #endif + ++#include <climits> + #include "MPEGaudio.h" + + static const unsigned int +@@ -550,11 +551,11 @@ htd33[ 31][2]={{ 16, 1},{ 8, 1},{ 4, + + const HUFFMANCODETABLE MPEGaudio::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, UINT_MAX, UINT_MAX, 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +565,7 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, UINT_MAX, UINT_MAX, 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, diff --git a/smpeg/smpeg-no-gtk.patch b/smpeg/smpeg-no-gtk.patch new file mode 100644 index 0000000..792596c --- /dev/null +++ b/smpeg/smpeg-no-gtk.patch @@ -0,0 +1,37 @@ +From 62cda978596a323cd7042722f906df906007e5b5 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Sat, 15 Apr 2017 13:24:39 -0700 +Subject: [PATCH] Comment out GTK detection + +--- + configure.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.in b/configure.in +index 20b1355..2cb4753 100644 +--- a/configure.in ++++ b/configure.in +@@ -208,13 +208,13 @@ AC_ARG_ENABLE(gtk_player, + [ --enable-gtk-player build a GTk sample SMPEG player [default=yes]], + , enable_gtk_player=yes) + have_gtk=no +-if test x$enable_gtk_player = xyes; then +- AM_PATH_GTK(1.2.1, have_gtk=yes) +- if test x$have_gtk = xyes; then +- CFLAGS="$CFLAGS $GTK_CFLAGS" +- fi +- AC_SUBST(GTK_LIBS) +-fi ++dnl if test x$enable_gtk_player = xyes; then ++dnl AM_PATH_GTK(1.2.1, have_gtk=yes) ++dnl if test x$have_gtk = xyes; then ++dnl CFLAGS="$CFLAGS $GTK_CFLAGS" ++dnl fi ++dnl AC_SUBST(GTK_LIBS) ++dnl fi + AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes) + + dnl See if we can build the Mesa player +-- +2.12.2 + |