Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b3685f9fb944ef3dde2c531d003421ecb8ccceab
commit b3685f9fb944ef3dde2c531d003421ecb8ccceab Author: kikadf <[email protected]> Date: Mon Nov 25 09:40:16 2013 +0100 snd-14.2-1-x86_64 * Version bump diff --git a/source/xmultimedia-extra/snd/FrugalBuild b/source/xmultimedia-extra/snd/FrugalBuild index ff3d074..8e3ee63 100644 --- a/source/xmultimedia-extra/snd/FrugalBuild +++ b/source/xmultimedia-extra/snd/FrugalBuild @@ -5,7 +5,7 @@ options+=('asneeded') pkgname=snd -pkgver=14.1 +pkgver=14.2 pkgrel=1 pkgdesc="A sound editor, with JACK and GTK+ enabled" depends=('fam' 'fftw' 'gsl' 'gtk+2' 'jack' 'libsamplerate') @@ -14,7 +14,9 @@ Fconfopts+=" --with-gtk --with-x --with-jack --with-ruby --with-ladspa" groups=('xmultimedia-extra') archs=('i686' 'x86_64') Finclude sourceforge -source=($source snd-ladspa.patch) -sha1sums=('fe4feef335f3392298bcfa599b334f8e5c6bd173' \ - 'ecfeec5b7dc7a545e78a038b8a6090f9e7ca8b6d') +source=($source disable-gtk3.patch) +sha1sums=('042a01f6669fba3f99192d8da6faf0c279b59eef' \ + '0992c68ad4da375bb506a79eb6a1d1d962091f7d') + +# optimization OK diff --git a/source/xmultimedia-extra/snd/disable-gtk3.patch b/source/xmultimedia-extra/snd/disable-gtk3.patch new file mode 100644 index 0000000..6705433 --- /dev/null +++ b/source/xmultimedia-extra/snd/disable-gtk3.patch @@ -0,0 +1,23 @@ +diff -Naur snd-14.2/configure snd-14.2.new/configure +--- snd-14.2/configure 2013-11-21 22:10:26.000000000 +0100 ++++ snd-14.2.new/configure 2013-11-25 09:34:46.490113440 +0100 +@@ -5053,19 +5053,12 @@ + + if test "$ac_snd_gui_choice" = none ; then + if test x$PKG_CONFIG != xno ; then +- if $PKG_CONFIG gtk+-3.0 --exists ; then +- GTK_CFLAGS="`$PKG_CONFIG gtk+-3.0 --cflags`" +- GTK_LIBS="`$PKG_CONFIG gtk+-3.0 --libs`" +- GTK_LD_LIBS="`$PKG_CONFIG gtk+-3.0 --libs-only-L` `$PKG_CONFIG gtk+-3.0 --libs-only-l`" +- ac_snd_gui_choice=gtk +- else + if $PKG_CONFIG gtk+-2.0 --exists ; then + GTK_CFLAGS="`$PKG_CONFIG gtk+-2.0 --cflags`" + GTK_LIBS="`$PKG_CONFIG gtk+-2.0 --libs`" + GTK_LD_LIBS="`$PKG_CONFIG gtk+-2.0 --libs-only-L` `$PKG_CONFIG gtk+-2.0 --libs-only-l`" + ac_snd_gui_choice=gtk + fi +- fi + fi + if test "$ac_snd_gui_choice" = gtk ; then + GX_FILES="GTK_O_FILES" diff --git a/source/xmultimedia-extra/snd/snd-ladspa.patch b/source/xmultimedia-extra/snd/snd-ladspa.patch deleted file mode 100644 index 107187f..0000000 --- a/source/xmultimedia-extra/snd/snd-ladspa.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur snd-14.1/snd-ladspa.c snd-14.1.new/snd-ladspa.c ---- snd-14.1/snd-ladspa.c 2013-09-27 01:16:13.000000000 +0200 -+++ snd-14.1.new/snd-ladspa.c 2013-11-11 20:48:01.759229699 +0100 -@@ -1191,7 +1191,7 @@ - if (descriptor->connect_port) - descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr), - XEN_TO_C_ULONG(port), -- double_to_float(samples->data, samples->length) -+ double_to_float(mus_vct_data(samples), mus_vct_length(samples)) - ); - return(XEN_FALSE); - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
