patches/libdts-02-shared.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 368 4f17f8b5e830
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name

diff -urN aa/libdts-0.0.2/configure.ac libdts-0.0.2/configure.ac
--- aa/libdts-0.0.2/configure.ac	2004-02-29 13:00:32.000000000 +0100
+++ libdts-0.0.2/configure.ac	2004-08-02 23:38:20.731578544 +0200
@@ -83,16 +83,7 @@
 #libtool# AC_PROG_LIBTOOL
 
 dnl Build the PIC library? - to be removed once libtool is re-enabled
-AC_PROG_RANLIB
-case "${target_os}" in
-  *mingw32* | *cygwin* | *djgpp*)
-    NEED_PIC=false
-    ;;
-  *)
-    NEED_PIC=:
-    ;;
-esac
-AM_CONDITIONAL(NEED_PIC, ${NEED_PIC})
+AC_PROG_LIBTOOL
 
 dnl Checks for libraries.
 LIBAO_LIBS="-lm"
diff -urN aa/libdts-0.0.2/libdts/Makefile.am libdts-0.0.2/libdts/Makefile.am
--- aa/libdts-0.0.2/libdts/Makefile.am	2004-02-25 14:52:15.000000000 +0100
+++ libdts-0.0.2/libdts/Makefile.am	2004-08-02 23:39:31.091882152 +0200
@@ -1,22 +1,13 @@
 AM_CFLAGS = $(OPT_CFLAGS) $(LIBDTS_CFLAGS)
 
-#libtool# lib_LTLIBRARIES = libdts.la
-#libtool# 
-#libtool# libdts_la_SOURCES = bitstream.c parse.c downmix.c
-#libtool# libdts_la_LIBADD = $(LIBDTS_LIBS)
-#libtool# libdts_la_LDFLAGS = -no-undefined
+lib_LTLIBRARIES = libdts.la
 
-lib_LIBRARIES = libdts.a $(libdts_pic_a)
-libdts_a_SOURCES = bitstream.c parse.c downmix.c
+libdts_la_SOURCES = bitstream.c parse.c downmix.c
+libdts_la_LIBADD = $(LIBDTS_LIBS)
+libdts_la_LDFLAGS = -no-undefined
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libdts.pc
 
 EXTRA_DIST = configure.incl dts_internal.h bitstream.h tables.h tables_quantization.h tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h
 
-if NEED_PIC
-libdts_pic_a = libdts_pic.a
-endif
-libdts_pic_a_SOURCES = $(libdts_a_SOURCES)
-libdts_pic_a_CPPFLAGS = -fPIC -DPIC
-
diff -urN aa/libdts-0.0.2/src/Makefile.am libdts-0.0.2/src/Makefile.am
--- aa/libdts-0.0.2/src/Makefile.am	2004-02-25 14:52:16.000000000 +0100
+++ libdts-0.0.2/src/Makefile.am	2004-08-02 23:40:13.531430360 +0200
@@ -2,10 +2,8 @@
 
 bin_PROGRAMS = dtsdec extract_dts
 dtsdec_SOURCES = dtsdec.c getopt.c gettimeofday.c
-#libtool# dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
-#libtool# 	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
-dtsdec_LDADD = $(top_builddir)/libdts/libdts.a \
-	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
+dtsdec_LDADD = $(top_builddir)/libdts/libdts.la \
+ 	       $(top_builddir)/libao/libao.a $(LIBAO_LIBS)
 extract_dts_SOURCES = extract_dts.c getopt.c
 
 man_MANS = dtsdec.1 extract_dts.1
--- libdts-0.0.2/libdts/configure.incl.orig	2004-02-05 10:13:58.000000000 +0100
+++ libdts-0.0.2/libdts/configure.incl	2004-08-24 21:58:48.878518052 +0200
@@ -1,9 +1,6 @@
 AC_SUBST([LIBDTS_CFLAGS])
 AC_SUBST([LIBDTS_LIBS])
 
-dnl avoid -fPIC when possible
-AC_LIBTOOL_NON_PIC([LIBDTS_CFLAGS="$LIBDTS_CFLAGS -prefer-non-pic"])
-
 AC_ARG_ENABLE([fixed],
     [  --enable-fixed          use fixed-point (integer-based) arithmetic])
 AC_ARG_ENABLE([double],