Source Mage code commit list

[Sukneet Basuta <scm AT sourcemage.org>]

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

 audio-libs/ladspa/HISTORY                                  |    5 
 audio-libs/ladspa/PRE_BUILD                                |    4 
 audio-libs/ladspa/ladspa-1.13-properbuild.patch            |   92 ++++++++
 audio-plugins/swh-plugins/HISTORY                          |    8 
 audio-plugins/swh-plugins/PRE_BUILD                        |    9 
 audio-plugins/swh-plugins/swh-plugins-0.4.15-gettext.patch |   12 +
 audio-plugins/swh-plugins/swh-plugins-0.4.15-pic.patch     |  135 
+++++++++++++
 7 files changed, 265 insertions(+)

New commits:
commit c569b72dfca7a93dc352fc0c63fbf67ad8370567
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

    swh-plugins: Run autopoint and autoreconf
    PRE_BUILD added, to apply patches and run autopoint and autoreconf. 
Autopoint is run to update gettext macros.
    
    swh-plugins-0.4.15-gettext.patch: added. Adds gettext version so 
autopoint can be run. From gentoo
    
    swh-plugins-0.4.15-pic.patch: added. To allow for PIC support From gentoo

commit a4b454c390351033d96be709a424cc5cd87f4755
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

    ladspa: patch for proper PIC support
    PRE_BUILD: added, to apply patch.
    
    ladspa-1.13-properbuild.patch: added, to apply proper PIC support and 
properly handle LDFLAGS. From Gento

diff --git a/audio-libs/ladspa/HISTORY b/audio-libs/ladspa/HISTORY
index 1fb69c9..8dd7f41 100644
--- a/audio-libs/ladspa/HISTORY
+++ b/audio-libs/ladspa/HISTORY
@@ -1,3 +1,8 @@
+2012-09-22 Sukneet Basuta <sukneet AT sourcemage.org>
+       * PRE_BUILD: added, to apply patch.
+       * ladspa-1.13-properbuild.patch: added, to apply proper
+         PIC support and properly handle LDFLAGS. From Gentoo
+
 2011-01-05 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: use CFLAGS
 
diff --git a/audio-libs/ladspa/PRE_BUILD b/audio-libs/ladspa/PRE_BUILD
new file mode 100755
index 0000000..2469fc2
--- /dev/null
+++ b/audio-libs/ladspa/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/ladspa-1.13-properbuild.patch
diff --git a/audio-libs/ladspa/ladspa-1.13-properbuild.patch 
b/audio-libs/ladspa/ladspa-1.13-properbuild.patch
new file mode 100644
index 0000000..c30a508
--- /dev/null
+++ b/audio-libs/ladspa/ladspa-1.13-properbuild.patch
@@ -0,0 +1,92 @@
+Index: ladspa_sdk/src/makefile
+===================================================================
+--- ladspa_sdk.orig/src/makefile
++++ ladspa_sdk/src/makefile
+@@ -13,10 +13,12 @@ INSTALL_BINARY_DIR =       /usr/bin/
+ # GENERAL
+ #
+ 
++CFLAGS                =       -Wall -Werror -O3
++CXXFLAGS      =       -Wall -Werror -O3
++
+ INCLUDES      =       -I.
+-LIBRARIES     =       -ldl -lm
+-CFLAGS                =       $(INCLUDES) -Wall -Werror -O3 -fPIC
+-CXXFLAGS      =       $(CFLAGS)
++DYNAMIC_LD_LIBS =     -ldl
++LIBRARIES     =       $(DYNAMIC_LD_LIBS) -lm
+ PLUGINS               =       ../plugins/amp.so                             
  \
+                       ../plugins/delay.so                             \
+                       ../plugins/filter.so                            \
+@@ -26,7 +28,8 @@ PROGRAMS     =       ../bin/analyseplugin                  
          \
+                       ../bin/applyplugin                              \
+                       ../bin/listplugins
+ CC            =       cc
+-CPP           =       c++
++CXX           =       c++
++MKDIR_P               =       mkdirhier
+ 
+ 
###############################################################################
+ #
+@@ -34,12 +37,12 @@ CPP                =       c++
+ #
+ 
+ ../plugins/%.so:      plugins/%.c ladspa.h
+-      $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c
+-      $(LD) -o ../plugins/$*.so plugins/$*.o -shared
++      $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c
++      $(LD) $(RAW_LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
+ 
+ ../plugins/%.so:      plugins/%.cpp ladspa.h
+-      $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp
+-      $(CPP) -o ../plugins/$*.so plugins/$*.o -shared
++      $(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp
++      $(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared
+ 
+ 
###############################################################################
+ #
+@@ -59,12 +62,12 @@ test:      /tmp/test.wav ../snd/noise.wav alw
+       @echo Test complete.
+ 
+ install:      targets
+-      -mkdirhier $(INSTALL_PLUGINS_DIR)
+-      -mkdirhier $(INSTALL_INCLUDE_DIR)
+-      -mkdirhier $(INSTALL_BINARY_DIR)
+-      cp ../plugins/* $(INSTALL_PLUGINS_DIR)
+-      cp ladspa.h $(INSTALL_INCLUDE_DIR)
+-      cp ../bin/* $(INSTALL_BINARY_DIR)
++      -$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++      -$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++      -$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR)
++      cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR)
++      cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR)
++      cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR)
+ 
+ /tmp/test.wav:        targets ../snd/noise.wav
+       ../bin/listplugins
+@@ -90,19 +93,19 @@ targets:   $(PLUGINS) $(PROGRAMS)
+ #
+ 
+ ../bin/applyplugin:   applyplugin.o load.o default.o
+-      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
++      $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)                          \
+               -o ../bin/applyplugin                                   \
+-              applyplugin.o load.o default.o
++              applyplugin.o load.o default.o $(LIBRARIES)
+ 
+ ../bin/analyseplugin: analyseplugin.o load.o default.o
+-      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
++      $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)                          \
+               -o ../bin/analyseplugin                                 \
+-              analyseplugin.o load.o default.o
++              analyseplugin.o load.o default.o $(LIBRARIES)
+ 
+ ../bin/listplugins:   listplugins.o search.o
+-      $(CC) $(CFLAGS) $(LIBRARIES)                                    \
++      $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)                          \
+               -o ../bin/listplugins                                   \
+-              listplugins.o search.o
++              listplugins.o search.o $(LIBRARIES)
+ 
+ 
###############################################################################
+ #
diff --git a/audio-plugins/swh-plugins/HISTORY 
b/audio-plugins/swh-plugins/HISTORY
index f109dbe..c28f7f2 100644
--- a/audio-plugins/swh-plugins/HISTORY
+++ b/audio-plugins/swh-plugins/HISTORY
@@ -1,3 +1,11 @@
+2012-09-22 Sukneet Basuta <sukneet AT sourcemage.org>
+       * PRE_BUILD: added, to apply patches and run autopoint and 
+         autoreconf. Autopoint is run to update gettext macros.
+       * swh-plugins-0.4.15-gettext.patch: added. Adds gettext version
+         so autopoint can be run. From gentoo
+       * swh-plugins-0.4.15-pic.patch: added. To allow for PIC support
+         From gentoo
+
 2006-08-17 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Removed UPDATED and MAINTAINER, did minor formatting 
          fixes.
diff --git a/audio-plugins/swh-plugins/PRE_BUILD 
b/audio-plugins/swh-plugins/PRE_BUILD
new file mode 100755
index 0000000..c3c684d
--- /dev/null
+++ b/audio-plugins/swh-plugins/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-gettext.patch &&
+patch -p1 < $SPELL_DIRECTORY/swh-plugins-0.4.15-pic.patch &&
+
+# ipdate gettext macros
+autopoint -f &&
+autoreconf -f -i
diff --git a/audio-plugins/swh-plugins/swh-plugins-0.4.15-gettext.patch 
b/audio-plugins/swh-plugins/swh-plugins-0.4.15-gettext.patch
new file mode 100644
index 0000000..9178983
--- /dev/null
+++ b/audio-plugins/swh-plugins/swh-plugins-0.4.15-gettext.patch
@@ -0,0 +1,12 @@
+Index: swh-plugins-0.4.15/configure.in
+===================================================================
+--- swh-plugins-0.4.15.orig/configure.in
++++ swh-plugins-0.4.15/configure.in
+@@ -52,6 +52,7 @@ AC_PROG_CC
+ AC_REQUIRE_CPP
+ ALL_LINGUAS="en_GB"
+ AM_GNU_GETTEXT([external])
++AM_GNU_GETTEXT_VERSION([0.13])
+ AC_C_BIGENDIAN
+ 
+ LIBS="$LIBS -lm"
diff --git a/audio-plugins/swh-plugins/swh-plugins-0.4.15-pic.patch 
b/audio-plugins/swh-plugins/swh-plugins-0.4.15-pic.patch
new file mode 100644
index 0000000..58fcd64
--- /dev/null
+++ b/audio-plugins/swh-plugins/swh-plugins-0.4.15-pic.patch
@@ -0,0 +1,135 @@
+Index: swh-plugins-0.4.15/gsm/Makefile.am
+===================================================================
+--- swh-plugins-0.4.15.orig/gsm/Makefile.am
++++ swh-plugins-0.4.15/gsm/Makefile.am
+@@ -2,12 +2,12 @@ LIBTOOL=libtool
+ RANLIB=ranlib
+ 
+ noinst_HEADERS = gsm.h config.h private.h proto.h unproto.h
+-noinst_LIBRARIES = libgsm.a
++noinst_LTLIBRARIES = libgsm.la
+ 
+ CFILES = add.c decode.c gsm_decode.c gsm_encode.c long_term.c preprocess.c \
+       short_term.c code.c gsm_create.c gsm_destroy.c gsm_option.c lpc.c 
rpe.c table.c
+ 
+-libgsm_a_SOURCES = $(CFILES) $(noinst_HEADERS)
++libgsm_la_SOURCES = $(CFILES) $(noinst_HEADERS)
+ 
+ # Disable autoheader. 
+ AUTOHEADER=echo
+Index: swh-plugins-0.4.15/Makefile.am
+===================================================================
+--- swh-plugins-0.4.15.orig/Makefile.am
++++ swh-plugins-0.4.15/Makefile.am
+@@ -48,10 +48,10 @@ DESTDIR = $(INSTALL_ROOT)
+ DISTFN = $(distdir)
+ 
+ # Files needed for FFT based plugins
+-pitch_scale_1193_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
++pitch_scale_1193_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
+ pitch_scale_1193_la_CFLAGS = $(FFTW_CFLAGS)
+ pitch_scale_1193_la_SOURCES = pitch_scale_1193.c
+-pitch_scale_1194_la_LIBADD = util/libpitchscale.a $(FFTW_LIBS)
++pitch_scale_1194_la_LIBADD = util/libpitchscale.la $(FFTW_LIBS)
+ pitch_scale_1194_la_CFLAGS = $(FFTW_CFLAGS)
+ pitch_scale_1194_la_SOURCES = pitch_scale_1194.c
+ mbeq_1197_la_LIBADD = $(FFTW_LIBS)
+@@ -60,33 +60,33 @@ mbeq_1197_la_SOURCES = mbeq_1197.c
+ imp_1199_la_LIBADD = $(FFTW_LIBS)
+ imp_1199_la_CFLAGS = $(FFTW_CFLAGS)
+ imp_1199_la_DEPENDENCIES = @top_srcdir@/impulses/*
+-hermes_filter_1200_la_DEPENDENCIES = util/libblo.a
+-hermes_filter_1200_la_LIBADD = util/libblo.a
+-fm_osc_1415_la_DEPENDENCIES = util/libblo.a
+-fm_osc_1415_la_LIBADD = util/libblo.a
+-analogue_osc_1416_la_DEPENDENCIES = util/libblo.a
+-analogue_osc_1416_la_LIBADD = util/libblo.a
+-sc1_1425_la_LIBADD = util/libdb.a util/librms.a
+-sc2_1426_la_LIBADD = util/libdb.a util/librms.a
+-sc3_1427_la_LIBADD = util/libdb.a util/librms.a
+-sc4_1882_la_LIBADD = util/libdb.a util/librms.a
+-sc4m_1916_la_LIBADD = util/libdb.a util/librms.a
+-se4_1883_la_LIBADD = util/libdb.a util/librms.a
+-gsm_1215_la_LIBADD = gsm/libgsm.a
+-gverb_1216_la_LIBADD = gverb/libgverb.a
++hermes_filter_1200_la_DEPENDENCIES = util/libblo.la
++hermes_filter_1200_la_LIBADD = util/libblo.la
++fm_osc_1415_la_DEPENDENCIES = util/libblo.la
++fm_osc_1415_la_LIBADD = util/libblo.la
++analogue_osc_1416_la_DEPENDENCIES = util/libblo.la
++analogue_osc_1416_la_LIBADD = util/libblo.la
++sc1_1425_la_LIBADD = util/libdb.la util/librms.la
++sc2_1426_la_LIBADD = util/libdb.la util/librms.la
++sc3_1427_la_LIBADD = util/libdb.la util/librms.la
++sc4_1882_la_LIBADD = util/libdb.la util/librms.la
++sc4m_1916_la_LIBADD = util/libdb.la util/librms.la
++se4_1883_la_LIBADD = util/libdb.la util/librms.la
++gsm_1215_la_LIBADD = gsm/libgsm.la
++gverb_1216_la_LIBADD = gverb/libgverb.la
+ lcr_delay_1436_la_DEPENDENCIES = util/biquad.h
+ 
+-highpass_iir_1890_la_LIBADD = util/libiir.a
++highpass_iir_1890_la_LIBADD = util/libiir.la
+ highpass_iir_1890_la_SOURCES = highpass_iir_1890.c
+-lowpass_iir_1891_la_LIBADD = util/libiir.a
++lowpass_iir_1891_la_LIBADD = util/libiir.la
+ lowpass_iir_1891_la_SOURCES = lowpass_iir_1891.c
+-bandpass_iir_1892_la_LIBADD = util/libiir.a
++bandpass_iir_1892_la_LIBADD = util/libiir.la
+ bandpass_iir_1892_la_SOURCES = bandpass_iir_1892.c
+-bandpass_a_iir_1893_la_LIBADD = util/libiir.a
++bandpass_a_iir_1893_la_LIBADD = util/libiir.la
+ bandpass_a_iir_1893_la_SOURCES = bandpass_a_iir_1893.c
+-notch_iir_1894_la_LIBADD = util/libiir.a
++notch_iir_1894_la_LIBADD = util/libiir.la
+ notch_iir_1894_la_SOURCES = notch_iir_1894.c
+-butterworth_1902_la_LIBADD = util/libiir.a
++butterworth_1902_la_LIBADD = util/libiir.la
+ butterworth_1902_la_SOURCES = butterworth_1902.c
+ 
+ # Rule to build .c files from XML source
+Index: swh-plugins-0.4.15/util/Makefile.am
+===================================================================
+--- swh-plugins-0.4.15.orig/util/Makefile.am
++++ swh-plugins-0.4.15/util/Makefile.am
+@@ -3,16 +3,16 @@ RANLIB=ranlib
+ 
+ noinst_HEADERS = rms.h db.h blo.h pitchscale.h waveguide_nl.h biquad.h 
iir.h buffer.h ls_filter.h
+ 
+-noinst_LIBRARIES = librms.a libdb.a libblo.a libpitchscale.a libiir.a
++noinst_LTLIBRARIES = librms.la libdb.la libblo.la libpitchscale.la libiir.la
+ 
+-librms_a_SOURCES = rms.c
+-libdb_a_SOURCES = db.c
+-libblo_a_SOURCES = blo.c
+-libblo_a_CFLAGS = -I@top_srcdir@
+-libpitchscale_a_SOURCES = pitchscale.c
+-libpitchscale_a_CFLAGS = $(FFTW_CFLAGS)
++librms_la_SOURCES = rms.c
++libdb_la_SOURCES = db.c
++libblo_la_SOURCES = blo.c
++libblo_la_CFLAGS = -I@top_srcdir@
++libpitchscale_la_SOURCES = pitchscale.c
++libpitchscale_la_CFLAGS = $(FFTW_CFLAGS)
+ #libpitchscale_a_LIBS = $(FFTW_LIBS)
+-libiir_a_SOURCES = iir.c
++libiir_la_SOURCES = iir.c
+ #libbuffer_a_SOURCES = buffer.c
+ # Disable autoheader. 
+ AUTOHEADER=echo
+Index: swh-plugins-0.4.15/gverb/Makefile.am
+===================================================================
+--- swh-plugins-0.4.15.orig/gverb/Makefile.am
++++ swh-plugins-0.4.15/gverb/Makefile.am
+@@ -3,9 +3,9 @@ RANLIB=ranlib
+ 
+ noinst_HEADERS = gverb.h gverbdsp.h
+ 
+-noinst_LIBRARIES = libgverb.a
++noinst_LTLIBRARIES = libgverb.la
+ 
+-libgverb_a_SOURCES = gverb.c gverbdsp.c
++libgverb_la_SOURCES = gverb.c gverbdsp.c
+ 
+ # Disable autoheader. 
+ AUTOHEADER=echo