summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libcaca/files/libcaca-0.9-libtool.patch')
-rw-r--r--media-libs/libcaca/files/libcaca-0.9-libtool.patch139
1 files changed, 139 insertions, 0 deletions
diff --git a/media-libs/libcaca/files/libcaca-0.9-libtool.patch b/media-libs/libcaca/files/libcaca-0.9-libtool.patch
new file mode 100644
index 000000000000..98e59f55cb44
--- /dev/null
+++ b/media-libs/libcaca/files/libcaca-0.9-libtool.patch
@@ -0,0 +1,139 @@
+diff -ru libcaca-0.9.old/caca-config.in libcaca-0.9/caca-config.in
+--- libcaca-0.9.old/caca-config.in 2004-02-02 04:00:20.000000000 +0100
++++ libcaca-0.9/caca-config.in 2004-09-28 00:02:01.950094712 +0200
+@@ -63,13 +63,9 @@
+ --ldflags)
+ echo_ldflags=yes
+ ;;
+-@NEED_PIC_TRUE@ --libs)
+-@NEED_PIC_FALSE@ --libs | --plugin-libs)
++ --libs | --plugin-libs)
+ echo_libs=yes
+ ;;
+-@NEED_PIC_TRUE@ --plugin-libs)
+-@NEED_PIC_TRUE@ echo_plugin_libs=yes
+-@NEED_PIC_TRUE@ ;;
+ *)
+ usage 1 1>&2
+ ;;
+@@ -111,9 +107,3 @@
+ then
+ echo -L@libdir@ -lcaca @CACA_LIBS@
+ fi
+-
+-@NEED_PIC_TRUE@if test "$echo_plugin_libs" = "yes"
+-@NEED_PIC_TRUE@then
+-@NEED_PIC_TRUE@ echo -L@libdir@ -lcaca_pic @CACA_LIBS@
+-@NEED_PIC_TRUE@fi
+-
+diff -ru libcaca-0.9.old/configure.ac libcaca-0.9/configure.ac
+--- libcaca-0.9.old/configure.ac 2004-09-28 00:01:20.092458040 +0200
++++ libcaca-0.9/configure.ac 2004-09-27 23:59:22.013408784 +0200
+@@ -11,7 +11,7 @@
+
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+
+ AC_C_CONST
+ AC_C_INLINE
+diff -ru libcaca-0.9.old/examples/Makefile.am libcaca-0.9/examples/Makefile.am
+--- libcaca-0.9.old/examples/Makefile.am 2004-09-28 00:01:20.093457888 +0200
++++ libcaca-0.9/examples/Makefile.am 2004-09-27 23:59:22.013408784 +0200
+@@ -7,27 +7,27 @@
+ bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacamoir
+
+ cacademo_SOURCES = demo.c
+-cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
++cacademo_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+ cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
+
+ cacafire_SOURCES = aafire.c
+-cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@
++cacafire_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
+
+ cacaball_SOURCES = cacaball.c
+-cacaball_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
++cacaball_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+ cacaball_CPPFLAGS = -I$(top_srcdir)/src
+
+ cacaplas_SOURCES = cacaplas.c
+-cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
++cacaplas_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+ cacaplas_CPPFLAGS = -I$(top_srcdir)/src
+
+ cacamoir_SOURCES = cacamoir.c
+-cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
++cacamoir_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+ cacamoir_CPPFLAGS = -I$(top_srcdir)/src
+
+ cacaview_SOURCES = cacaview.c
+-cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
++cacaview_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
+ if USE_IMLIB2
+ cacaview_CFLAGS = `imlib2-config --cflags`
+diff -ru libcaca-0.9.old/src/Makefile.am libcaca-0.9/src/Makefile.am
+--- libcaca-0.9.old/src/Makefile.am 2004-09-28 00:01:20.094457736 +0200
++++ libcaca-0.9/src/Makefile.am 2004-09-27 23:59:22.013408784 +0200
+@@ -2,8 +2,9 @@
+
+ include_HEADERS = caca.h
+
+-lib_LIBRARIES = libcaca.a $(libcaca_pic_a)
+-libcaca_a_SOURCES = \
++lib_LTLIBRARIES = libcaca.la
++libcaca_la_LDFLAGS = -version-info 0:9:0
++libcaca_la_SOURCES = \
+ caca.c \
+ caca.h \
+ caca_internals.h \
+@@ -18,10 +19,3 @@
+ bitmap.c \
+ time.c \
+ $(NULL)
+-
+-if NEED_PIC
+-libcaca_pic_a = libcaca_pic.a
+-endif
+-libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES)
+-libcaca_pic_a_CPPFLAGS = -fPIC -DPIC
+-
+diff -ru libcaca-0.9.old/test/Makefile.am libcaca-0.9/test/Makefile.am
+--- libcaca-0.9.old/test/Makefile.am 2004-09-28 00:01:20.094457736 +0200
++++ libcaca-0.9/test/Makefile.am 2004-09-27 23:59:22.013408784 +0200
+@@ -3,26 +3,26 @@
+ noinst_PROGRAMS = colors dithering event hsv optipal spritedit
+
+ colors_SOURCES = colors.c
+-colors_LDADD = ../src/libcaca.a @CACA_LIBS@
++colors_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ colors_CPPFLAGS = -I$(top_srcdir)/src
+
+ dithering_SOURCES = dithering.c
+-dithering_LDADD = ../src/libcaca.a @CACA_LIBS@
++dithering_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ dithering_CPPFLAGS = -I$(top_srcdir)/src
+
+ event_SOURCES = event.c
+-event_LDADD = ../src/libcaca.a @CACA_LIBS@
++event_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ event_CPPFLAGS = -I$(top_srcdir)/src
+
+ hsv_SOURCES = hsv.c
+-hsv_LDADD = ../src/libcaca.a @CACA_LIBS@
++hsv_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ hsv_CPPFLAGS = -I$(top_srcdir)/src
+
+ optipal_SOURCES = optipal.c
+-optipal_LDADD = ../src/libcaca.a @CACA_LIBS@
++optipal_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ optipal_CPPFLAGS = -I$(top_srcdir)/src
+
+ spritedit_SOURCES = spritedit.c
+-spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
++spritedit_LDADD = ../src/.libs/libcaca.a @CACA_LIBS@
+ spritedit_CPPFLAGS = -I$(top_srcdir)/src
+