[SCM] toonloop/master: Remove patches no longer necessary

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Thu Mar 6 21:15:25 UTC 2014


The following commit has been merged in the master branch:
commit 12a51379792f91a567619c0eb38ec0b921fc6a22
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Mar 6 17:19:45 2014 -0300

    Remove patches no longer necessary

diff --git a/debian/patches/0001_dont_use_werror.patch b/debian/patches/0001_dont_use_werror.patch
deleted file mode 100644
index 6931836..0000000
--- a/debian/patches/0001_dont_use_werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Avoid treating build warnings as errors
- Clutter triggers deprecation warnings which causes build to fail.
-Author: Sjoerd Simons <sjoerd at debian.org>
-Bug-Debian: http://bugs.debian.org/666756
-Forwarded: no
-Last-Update: 2012-04-06
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,7 +157,7 @@
- AC_DEFINE_UNQUOTED([DATADIR], "${DATADIR}", "Data dir")
- AC_DEFINE_UNQUOTED([PIXMAPS_DIR], "${PIXMAPS_DIR}", "Pixmaps dir")
- 
--AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Werror -Wno-unused-result -Wfatal-errors") 
-+AC_SUBST(CXXFLAGS, " -O2 -Wall -Wextra -Wno-unused-result -Wfatal-errors")
- AC_CONFIG_FILES([
-     Makefile
-     src/Makefile
diff --git a/debian/patches/0003-rtmidi.patch b/debian/patches/0003-rtmidi.patch
deleted file mode 100644
index 64c0dba..0000000
--- a/debian/patches/0003-rtmidi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Link against rtmidi to avoid FTBFS
-Author: Alessio Treglia <alessio at debian.org>
-Last-Update: 2012-02-08
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,11 +40,11 @@
- AC_LANG_PUSH(C++)
- # save original flags
- SAVED_LIBS=$LIBS
--LIBS="$LIBS -lstk"
-+LIBS="$LIBS -lstk -lrtmidi"
- AC_LINK_IFELSE(
-         [AC_LANG_PROGRAM([ #include <stk/RtMidi.h> ],
-         [RtMidiIn input])],
--        [AC_SUBST(STK_LIBS," -lstk -lrt -lm")],
-+        [AC_SUBST(STK_LIBS," -lstk -lrtmidi -lrt -lm")],
-         [AC_MSG_ERROR([libstk is not installed: alsa])])
- LIBS=$SAVED_LIBS # restore them
- AC_SUBST(STK_CXXFLAGS, "-D__LINUX_ALSA__ -D__UNIX_JACK__ -D__LITTLE_ENDIAN__")
diff --git a/debian/patches/0005-remove_endian_define.patch b/debian/patches/0005-remove_endian_define.patch
deleted file mode 100644
index e222058..0000000
--- a/debian/patches/0005-remove_endian_define.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Avoid hardcoding -D__LITTLE_ENDIAN__
- Partially fixes problems building on big-endian architectures by not
- hardcoding little-endian flag.  Should be coupled with build-time
- endian detection.
-Author: Laurent Bigonville <bigon at debian.org>
-Bug-Debian: http://bugs.debian.org/660151
-Forwarded: no
-Reviewed-By: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-04-06
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@
-         [AC_SUBST(STK_LIBS," -lstk -lrtmidi -lrt -lm")],
-         [AC_MSG_ERROR([libstk is not installed: alsa])])
- LIBS=$SAVED_LIBS # restore them
--AC_SUBST(STK_CXXFLAGS, "-D__LINUX_ALSA__ -D__UNIX_JACK__ -D__LITTLE_ENDIAN__")
-+AC_SUBST(STK_CXXFLAGS, "-D__LINUX_ALSA__ -D__UNIX_JACK__")
- AC_LANG_POP(C++)
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index e4fa9ac..13042a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-0001_dont_use_werror.patch
 0002-help2man.patch
-0003-rtmidi.patch
 0004-fix_arm.patch
-0005-remove_endian_define.patch
 0006_avoid_X11-needing_test.patch

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list