debian/patches/117-static-gallium.patch | 13 +++++++-
debian/patches/118-dricore-gallium.patch | 44 ++++++++++++++++++++++------
debian/patches/119-libllvmradeon-link.patch | 9 +++++
debian/patches/series | 1
4 files changed, 56 insertions(+), 11 deletions(-)
New commits:
commit b5d822cc8cb348d80a5a0673031aa7f671705082
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Fri Feb 8 15:40:33 2013 +0100
add debian/patches/119-libllvmradeon-link.patch to fixup libllvmradeon, and
fix all shlibdeps errors
diff --git a/debian/patches/117-static-gallium.patch
b/debian/patches/117-static-gallium.patch
index 6a81e43..ab72546 100644
--- a/debian/patches/117-static-gallium.patch
+++ b/debian/patches/117-static-gallium.patch
@@ -32,10 +32,10 @@
-I$(top_srcdir)/src/gallium/auxiliary/util \
- $(GALLIUM_CFLAGS) $(VISIBILITY_CFLAGS)
+ $(GALLIUM_CFLAGS)
++
++AM_CXXFLAGS =
-AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
-+AM_CXXFLAGS =
-+
+if HAVE_SHARED_GALLIUM
+lib_LTLIBRARIES = libgallium.la
+else
@@ -46,3 +46,12 @@
libgallium_la_SOURCES = \
$(C_SOURCES) \
+@@ -28,6 +34,8 @@
+
+ AM_CXXFLAGS += -fno-rtti
+
++libgallium_la_LIBADD = $(LLVM_LIBS)
++
+ endif
+
+ libgallium_la_SOURCES += \
diff --git a/debian/patches/118-dricore-gallium.patch
b/debian/patches/118-dricore-gallium.patch
index 4ec18d8..cfcc54d 100644
--- a/debian/patches/118-dricore-gallium.patch
+++ b/debian/patches/118-dricore-gallium.patch
@@ -1,6 +1,14 @@
--- a/src/mesa/libdricore/Makefile.am
+++ b/src/mesa/libdricore/Makefile.am
-@@ -65,8 +65,10 @@
+@@ -42,6 +42,7 @@
+ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+ libdricore@VERSION@_la_LIBADD = \
+ ../program/libdricore_program.la \
++ $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+ $()
+
+ if HAVE_X86_ASM
+@@ -65,8 +66,10 @@
-I$(top_srcdir)/src/mesa/sparc
endif
@@ -12,19 +20,18 @@
# Provide compatibility with scripts for the old Mesa build system for
# a while by putting a link to the driver into /lib of the build tree.
-@@ -76,6 +78,18 @@
+@@ -76,6 +79,17 @@
ln -sf libdricore@VERSION@.so.1
$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
endif
-+libmesagallium@VERSION@_la_SOURCES = \
++libmesagallium_la_SOURCES = \
+ $(STATETRACKER_FILES)
-+libmesagallium@VERSION@_la_CFLAGS = $(LLVM_CFLAGS)
-+libmesagallium@VERSION@_la_CXXFLAGS = $(LLVM_CXXFLAGS)
-+libmesagallium@VERSION@_la_LIBADD = libdricore@VERSION@.la
-+libmesagallium@VERSION@_la_LDFLAGS =
++libmesagallium_la_CFLAGS = @LLVM_CFLAGS@
++libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@
++libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS)
+
+if HAVE_GALLIUM
-+lib_LTLIBRARIES += libmesagallium@VERSION@.la
++noinst_LTLIBRARIES = libmesagallium.la
+endif
+
+
@@ -37,7 +44,7 @@
AC_SUBST([GLESv2_PC_LIB_PRIV])
DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
-+MESAGALLIUM_LIBS="\$(top_builddir)/src/mesa/libdricore/libmesagallium${VERSION}.la
${DRI_LIB_DEPS}"
++MESAGALLIUM_LIBS="${DRI_LIB_DEPS}"
+AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS})
AC_SUBST([HAVE_XF86VIDMODE])
@@ -158,3 +165,22 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gl.pc
+--- a/src/gallium/auxiliary/Makefile.am
++++ b/src/gallium/auxiliary/Makefile.am
+@@ -34,14 +34,14 @@
+
+ AM_CXXFLAGS += -fno-rtti
+
+-libgallium_la_LIBADD = $(LLVM_LIBS)
+-
+ endif
+
+ libgallium_la_SOURCES += \
+ $(GALLIVM_SOURCES) \
+ $(GALLIVM_CPP_SOURCES)
+
++libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS)
$(GALLIUM_DRI_LIB_DEPS)
++
+ endif
+
+ indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
diff --git a/debian/patches/119-libllvmradeon-link.patch
b/debian/patches/119-libllvmradeon-link.patch
new file mode 100644
index 0000000..ee47f8a
--- /dev/null
+++ b/debian/patches/119-libllvmradeon-link.patch
@@ -0,0 +1,9 @@
+--- a/src/gallium/drivers/radeon/Makefile.am
++++ b/src/gallium/drivers/radeon/Makefile.am
+@@ -26,5 +26,6 @@
+ $(C_FILES)
+
+ libllvmradeon@VERSION@_la_LIBADD = \
++ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(CLOCK_LIB) \
+ $(LLVM_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 41ef0c7..f75fc6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
101_ubuntu_hidden_glname.patch
117-static-gallium.patch
118-dricore-gallium.patch
+119-libllvmradeon-link.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u3p86-0005om...@vasks.debian.org
