[packages/lame] - rediffed

Sat Dec 9 14:02:16 CET 2023

commit c160e46a2c614d22de0f64a3fa75714ab112b6f8
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Sat Dec 9 13:09:54 2023 +0100

    - rediffed

 lame-link.patch        |  9 +++++----
 lame-sse.patch         | 39 +++++++++++++++++++++------------------
 lame-without_gtk.patch | 16 +++++++++-------
 3 files changed, 35 insertions(+), 29 deletions(-)
---

diff --git a/lame-link.patch b/lame-link.patch
index 024d065..01d8e09 100644
--- a/lame-link.patch
+++ b/lame-link.patch
@@ -1,6 +1,7 @@
---- lame-3.99/configure.in~	2011-05-07 17:44:18.000000000 +0200
-+++ lame-3.99/configure.in	2011-10-19 10:52:46.216679017 +0200
-@@ -367,9 +367,10 @@
+diff -urNp -x '*.orig' lame-3.100.org/configure.in lame-3.100/configure.in
+--- lame-3.100.org/configure.in	2017-08-15 17:16:31.000000000 +0200
++++ lame-3.100/configure.in	2023-12-09 13:08:16.736805434 +0100
+@@ -418,9 +418,10 @@ dnl Checks for libraries.
  
  AC_CHECK_HEADERS(termcap.h)
  AC_CHECK_HEADERS(ncurses/termcap.h)
@@ -13,4 +14,4 @@
 +      AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="termcap")])])])
  
  AM_ICONV
-  
+ 
diff --git a/lame-sse.patch b/lame-sse.patch
index 1c37aec..8e4c94b 100644
--- a/lame-sse.patch
+++ b/lame-sse.patch
@@ -1,18 +1,9 @@
---- lame-3.99.5/libmp3lame/vector/Makefile.am.orig	2007-01-09 11:15:53.000000000 +0100
-+++ lame-3.99.5/libmp3lame/vector/Makefile.am	2017-03-24 22:07:11.773733964 +0100
-@@ -8,6 +8,7 @@
- 
- ##liblamecpuroutines_la_LIBADD = 
- ##liblamecpuroutines_la_LDFLAGS =
-+liblamevectorroutines_la_CFLAGS = -msse
- 
- INCLUDES = @INCLUDES@ \
- 	-I$(top_srcdir)/libmp3lame \
---- lame-3.99.5/libmp3lame/fft.c.orig	2009-04-20 23:48:00.000000000 +0200
-+++ lame-3.99.5/libmp3lame/fft.c	2017-03-25 08:53:51.949957603 +0100
-@@ -308,7 +308,12 @@
+diff -urNp -x '*.orig' lame-3.100.org/libmp3lame/fft.c lame-3.100/libmp3lame/fft.c
+--- lame-3.100.org/libmp3lame/fft.c	2017-09-06 21:33:36.000000000 +0200
++++ lame-3.100/libmp3lame/fft.c	2023-12-09 13:09:38.767851762 +0100
+@@ -318,7 +318,12 @@ init_fft(lame_internal_flags * const gfc
      for (i = 0; i < BLKSIZE_s / 2; i++)
-         window_s[i] = 0.5 * (1.0 - cos(2.0 * PI * (i + 0.5) / BLKSIZE_s));
+         gfc->cd_psy->window_s[i] = 0.5 * (1.0 - cos(2.0 * PI * (i + 0.5) / BLKSIZE_s));
  
 -    gfc->fft_fht = fht;
 +#ifdef HAVE_XMMINTRIN_H
@@ -24,7 +15,7 @@
  #ifdef HAVE_NASM
      if (gfc->CPU_features.AMD_3DNow) {
          gfc->fft_fht = fht_3DN;
-@@ -316,14 +321,7 @@
+@@ -326,14 +331,7 @@ init_fft(lame_internal_flags * const gfc
      else if (gfc->CPU_features.SSE) {
          gfc->fft_fht = fht_SSE;
      }
@@ -41,9 +32,10 @@
  #endif
 +    gfc->fft_fht = fht;
  }
---- lame-3.99.5/libmp3lame/lame.c.orig	2017-03-25 08:56:45.616622288 +0100
-+++ lame-3.99.5/libmp3lame/lame.c	2017-03-25 08:56:51.436622221 +0100
-@@ -1344,12 +1344,11 @@
+diff -urNp -x '*.orig' lame-3.100.org/libmp3lame/lame.c lame-3.100/libmp3lame/lame.c
+--- lame-3.100.org/libmp3lame/lame.c	2017-10-10 21:08:39.000000000 +0200
++++ lame-3.100/libmp3lame/lame.c	2023-12-09 13:09:38.768851775 +0100
+@@ -1354,12 +1354,11 @@ lame_print_config(const lame_global_flag
          else if (gfc->CPU_features.SSE) {
              fft_asm_used = 2;
          }
@@ -59,3 +51,14 @@
  #endif
          if (gfc->CPU_features.MMX) {
  #ifdef MMX_choose_table
+diff -urNp -x '*.orig' lame-3.100.org/libmp3lame/vector/Makefile.am lame-3.100/libmp3lame/vector/Makefile.am
+--- lame-3.100.org/libmp3lame/vector/Makefile.am	2007-01-09 11:15:53.000000000 +0100
++++ lame-3.100/libmp3lame/vector/Makefile.am	2023-12-09 13:09:38.767851762 +0100
+@@ -8,6 +8,7 @@ endif
+ 
+ ##liblamecpuroutines_la_LIBADD = 
+ ##liblamecpuroutines_la_LDFLAGS =
++liblamevectorroutines_la_CFLAGS = -msse
+ 
+ INCLUDES = @INCLUDES@ \
+ 	-I$(top_srcdir)/libmp3lame \
diff --git a/lame-without_gtk.patch b/lame-without_gtk.patch
index 9e96d0c..78afd7e 100644
--- a/lame-without_gtk.patch
+++ b/lame-without_gtk.patch
@@ -1,6 +1,7 @@
---- lame-398/configure.in.orig	2008-08-30 12:40:34.000000000 +0200
-+++ lame-398/configure.in	2008-08-30 12:41:17.000000000 +0200
-@@ -386,7 +386,7 @@
+diff -urNp -x '*.orig' lame-3.100.org/configure.in lame-3.100/configure.in
+--- lame-3.100.org/configure.in	2023-12-09 13:09:15.432554115 +0100
++++ lame-3.100/configure.in	2023-12-09 13:09:15.512555135 +0100
+@@ -440,7 +440,7 @@ CONFIG_MATH_LIB="${USE_LIBM}"
  
  dnl configure use of features
  
@@ -9,11 +10,12 @@
  
  dnl ElectricFence malloc debugging
  AC_MSG_CHECKING(use of ElectricFence malloc debugging)
---- lame-398/frontend/Makefile.am.orig	2008-08-30 12:40:34.000000000 +0200
-+++ lame-398/frontend/Makefile.am	2008-08-30 12:41:44.000000000 +0200
-@@ -51,7 +51,7 @@
+diff -urNp -x '*.orig' lame-3.100.org/frontend/Makefile.am lame-3.100/frontend/Makefile.am
+--- lame-3.100.org/frontend/Makefile.am	2011-10-16 15:09:01.000000000 +0200
++++ lame-3.100/frontend/Makefile.am	2023-12-09 13:09:15.512555135 +0100
+@@ -35,7 +35,7 @@ lame_SOURCES = lame_main.c $(common_sour
+ mp3rtp_SOURCES = mp3rtp.c rtp.c $(common_sources)
  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@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lame.git/commitdiff/c160e46a2c614d22de0f64a3fa75714ab112b6f8

