lame:moved into main for pisi 2.0

This commit is contained in:
2015-07-22 16:08:46 +03:00
parent 11f2a2a547
commit dfba937a45
5 changed files with 174 additions and 0 deletions
@@ -0,0 +1,16 @@
--- lame-3.96/configure.in.ccc 2004-04-11 10:45:19.000000000 -0400
+++ lame-3.96/configure.in 2004-07-26 18:32:21.000000000 -0400
@@ -915,11 +915,9 @@
alpha*-*-linux*)
################################################################
-#### Check if 'ccc' is in our path
+#### Check if we're using Compaq's C Compiler: 'ccc'
################################################################
-if test "`which ccc 2>/dev/null | grep -c ccc`" != "0" ; then
- # Compaq's C Compiler
- CC=ccc
+if test "`echo $CC | sed 's/.*\///'`" = ccc; then
################################################################
#### set 'OPTIMIZATION = -arch host -tune host'
@@ -0,0 +1,24 @@
diff -Nur lame-398-2-old/configure.in lame-398-2/configure.in
--- lame-398-2-old/configure.in 2009-04-23 02:12:46.000000000 +0300
+++ lame-398-2/configure.in 2009-04-23 02:15:06.000000000 +0300
@@ -385,7 +385,7 @@
dnl configure use of features
-AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no")
+HAVE_GTK=no
dnl ElectricFence malloc debugging
AC_MSG_CHECKING(use of ElectricFence malloc debugging)
diff -Nur lame-398-2-old/frontend/Makefile.am lame-398-2/frontend/Makefile.am
--- lame-398-2-old/frontend/Makefile.am 2009-04-23 02:12:46.000000000 +0300
+++ lame-398-2/frontend/Makefile.am 2009-04-23 02:14:07.000000000 +0300
@@ -51,7 +51,7 @@
mp3x_SOURCES = mp3x.c gtkanal.c gpkplotting.c $(common_sources)
endif
-CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
+CFLAGS = @CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)