mesa: Changes to 'ubuntu'
debian/changelog | 2
debian/control | 1
debian/patches/115_llvm_dynamic_linking.diff | 16 +--
debian/patches/116_use_shared_galliumcore.diff | 110 +++++++++----------------
debian/rules | 13 +-
5 files changed, 59 insertions(+), 83 deletions(-)
New commits:
commit c2c34d23f7f4f3c7c1ff52f53cac0b2ae236e97c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 24 16:04:47 2012 +0200
rules: rewrap dh_shlibdeps line
diff --git a/debian/rules b/debian/rules
index 50ba79c..13d4aff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -369,8 +369,9 @@ else
dh_makeshlibs -s -- -c1
endif
dh_installdeb -s
- dh_shlibdeps -s -l/usr/lib/$(DEB_HOST_MULTIARCH)/mesa:\
- /usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl
+ dh_shlibdeps -s \
+ -l/usr/lib/$(DEB_HOST_MULTIARCH)/mesa:\
+ /usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl
dh_gencontrol -s
dh_md5sums -s
dh_builddeb $(foreach pkg,$(dbgpkg),-p$(pkg)) -- -Zxz
commit ba1fbc56169a28ffa3c12be744a709121f2c25a8
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 24 15:49:02 2012 +0200
further merge goofs
diff --git a/debian/rules b/debian/rules
index 9e83d26..50ba79c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ else
endif
ifneq ($(DEB_HOST_ARCH), s390)
- DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon savage tdfx
+ DRI_DRIVERS += r200 radeon
endif
ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i915 i965
@@ -169,7 +169,6 @@ confflags-swx11+glu = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--disable-egl \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -178,7 +177,6 @@ confflags-swx11+glu-static = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
--enable-static \
--disable-egl \
CFLAGS="$(CFLAGS)" \
@@ -188,8 +186,6 @@ confflags-swx11+glu-i386-i686 = \
--disable-egl \
--with-gallium-drivers= \
--with-driver=xlib \
- --disable-gl-osmesa \
- --disable-glut \
--disable-egl \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
@@ -344,7 +340,7 @@ endif
dh_lintian -s
dh_link -s
# Install bug control and script:
- set -e; for p in `dh_listpackages -s`; do \
+ set -e; for p in $(allpkg); do \
install -d debian/$$p/usr/share/bug/$$p && \
install -m 644 debian/local/control debian/$$p/usr/share/bug/$$p && \
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
commit 40f7f2198d6412a313ca9e89cf8cd37e55702399
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 24 15:16:37 2012 +0200
add libxcb-glx0-dev to build-deps, lost in the merge
diff --git a/debian/control b/debian/control
index 5d5f0cc..338244b 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev,
libxcb-dri2-0-dev,
+ libxcb-glx0-dev,
libxcb-xfixes0-dev,
python-libxml2,
libudev-dev [linux-any],
commit 99e18cc4125c3c242a16c7432ee673274529eef0
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 24 15:15:05 2012 +0200
fix patch 116 to apply
diff --git a/debian/changelog b/debian/changelog
index ca17b1a..6c0b5ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
118_fix_24bpp_software_renering.diff
119_r600g_gnome_shell_rendering_fix.diff:
- Included upstream.
- * Update 115_llvm_dynamic_linking.diff to apply.
+ * Update 115_llvm_dynamic_linking.diff,
+ 116_use_shared_galliumcore.diff to apply.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Jan 2012 12:47:07 +0200
diff --git a/debian/patches/116_use_shared_galliumcore.diff b/debian/patches/116_use_shared_galliumcore.diff
index ae0a764..e202208 100644
--- a/debian/patches/116_use_shared_galliumcore.diff
+++ b/debian/patches/116_use_shared_galliumcore.diff
@@ -1,7 +1,7 @@
Index: mesa/bin/mklib
===================================================================
---- mesa.orig/bin/mklib 2011-06-27 10:35:46.212939355 +0100
-+++ mesa/bin/mklib 2011-06-27 15:03:51.680937254 +0100
+--- mesa.orig/bin/mklib 2012-01-24 15:03:01.709901821 +0200
++++ mesa/bin/mklib 2012-01-24 15:06:14.027663852 +0200
@@ -147,6 +147,7 @@
NOPREFIX=0
EXPORTS=""
@@ -58,54 +58,30 @@ Index: mesa/bin/mklib
# finish up
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-06-27 14:58:32.000000000 +0100
-+++ mesa/configure.ac 2011-06-27 15:03:51.680937254 +0100
-@@ -878,6 +878,41 @@
- GLAPI_LIB_DEPS="-lpthread"
- AC_SUBST([GLAPI_LIB_DEPS])
-
-+dnl Setup default DRI CFLAGS
-+DRI_CFLAGS='$(CFLAGS)'
-+DRI_CXXFLAGS='$(CXXFLAGS)'
-+DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
-+MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
-+
-+AC_ARG_ENABLE([shared-dricore],
-+ [AS_HELP_STRING([--enable-shared-dricore],
-+ [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],
-+ [enable_dricore="$enableval"],
-+ [enable_dricore=no])
-+if test "$mesa_driver" = dri ; then
-+ if test "$enable_dricore" = yes ; then
-+ if test "$GCC$GXX" != yesyes ; then
-+ AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling. Disabling shared dricore])
-+ enable_dricore=no
-+ else
-+ DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
-+ DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
-+ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
+--- mesa.orig/configure.ac 2012-01-24 15:06:14.019663612 +0200
++++ mesa/configure.ac 2012-01-24 15:06:14.027663852 +0200
+@@ -1092,7 +1092,8 @@
+ DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
+ DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
+ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
+- DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+ DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lgallium -ldricore -lglsl'
+ GALLIUM_LIB_DEPS='-lgallium'
-+ DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
-+ DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
-+ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
-+ fi
-+ fi
-+fi
-+AC_SUBST([DRICORE_LIBS])
-+AC_SUBST([DRICORE_GLSL_LIBS])
-+AC_SUBST([DRICORE_LIB_DEPS])
+ DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+ DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+ MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+@@ -1102,6 +1103,7 @@
+ AC_SUBST([DRICORE_LIBS])
+ AC_SUBST([DRICORE_GLSL_LIBS])
+ AC_SUBST([DRICORE_LIB_DEPS])
+AC_SUBST([GALLIUM_LIB_DEPS])
-+AC_SUBST([DRI_CXXFLAGS])
-+AC_SUBST([DRI_CFLAGS])
-+AC_SUBST([MESA_MODULES])
-
- dnl Setup default DRI CFLAGS
- DRI_CFLAGS='$(CFLAGS)'
+ AC_SUBST([DRI_CXXFLAGS])
+ AC_SUBST([DRI_CFLAGS])
+ AC_SUBST([MESA_MODULES])
Index: mesa/src/gallium/Makefile.template
===================================================================
---- mesa.orig/src/gallium/Makefile.template 2011-06-27 10:02:55.000000000 +0100
-+++ mesa/src/gallium/Makefile.template 2011-06-27 15:03:51.680937254 +0100
+--- mesa.orig/src/gallium/Makefile.template 2012-01-24 15:03:01.745902899 +0200
++++ mesa/src/gallium/Makefile.template 2012-01-24 15:06:14.027663852 +0200
@@ -30,7 +30,7 @@
##### TARGETS #####
@@ -138,9 +114,9 @@ Index: mesa/src/gallium/Makefile.template
sinclude depend
Index: mesa/src/gallium/auxiliary/Makefile
===================================================================
---- mesa.orig/src/gallium/auxiliary/Makefile 2011-06-27 10:35:46.000000000 +0100
-+++ mesa/src/gallium/auxiliary/Makefile 2011-06-27 15:03:51.690937634 +0100
-@@ -210,6 +210,14 @@
+--- mesa.orig/src/gallium/auxiliary/Makefile 2012-01-24 15:03:01.733902540 +0200
++++ mesa/src/gallium/auxiliary/Makefile 2012-01-24 15:06:14.027663852 +0200
+@@ -18,6 +18,14 @@
include ../Makefile.template
@@ -155,17 +131,18 @@ Index: mesa/src/gallium/auxiliary/Makefile
indices/u_indices_gen.c: indices/u_indices_gen.py
$(PYTHON2) $< > $@
-@@ -225,3 +233,5 @@
+@@ -33,4 +41,6 @@
util/u_half.c: util/u_half.py
$(PYTHON2) util/u_half.py > $@
+
+default:: $(TOP)/$(LIB_DIR)/libgallium.so
+ # DO NOT DELETE
Index: mesa/src/gallium/targets/Makefile.dri
===================================================================
---- mesa.orig/src/gallium/targets/Makefile.dri 2011-06-27 10:35:46.000000000 +0100
-+++ mesa/src/gallium/targets/Makefile.dri 2011-06-27 15:03:51.690937634 +0100
-@@ -10,7 +10,6 @@
+--- mesa.orig/src/gallium/targets/Makefile.dri 2012-01-24 15:03:01.741902780 +0200
++++ mesa/src/gallium/targets/Makefile.dri 2012-01-24 15:06:14.027663852 +0200
+@@ -7,7 +7,6 @@
endif
MESA_MODULES = \
@@ -173,7 +150,7 @@ Index: mesa/src/gallium/targets/Makefile.dri
$(GALLIUM_AUXILIARIES)
COMMON_GALLIUM_SOURCES = \
-@@ -79,8 +78,8 @@
+@@ -73,8 +72,8 @@
$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
$(OBJECTS) $(PIPE_DRIVERS) \
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
@@ -186,29 +163,28 @@ Index: mesa/src/gallium/targets/Makefile.dri
Index: mesa/src/mesa/Makefile
===================================================================
---- mesa.orig/src/mesa/Makefile 2011-06-27 10:35:46.000000000 +0100
-+++ mesa/src/mesa/Makefile 2011-06-27 15:04:39.542765727 +0100
-@@ -17,6 +17,9 @@
-
- DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
+--- mesa.orig/src/mesa/Makefile 2012-01-24 15:03:01.729902420 +0200
++++ mesa/src/mesa/Makefile 2012-01-24 15:07:20.349650974 +0200
+@@ -16,6 +16,8 @@
+ MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
+ MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
-+DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
+GALLIUMCORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(filter-out $(MESA_OBJECTS), $(MESA_GALLIUM_OBJECTS)))
+
# define preprocessor flags
MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
-@@ -66,7 +69,7 @@
+@@ -65,7 +67,7 @@
# Default: build dependencies, then asm_subdirs, GLSL built-in lib,
# then convenience libs (.a) and finally the device drivers:
-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) libgalliumcore.a driver_subdirs
- main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
- $(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@
-@@ -125,6 +128,10 @@
- @$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+ # include glapi_gen.mk for generating glapi headers for GLES
+ GLAPI := $(TOP)/src/mapi/glapi/gen
+@@ -146,6 +148,10 @@
+ @$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \
$(ALL_SOURCES) > /dev/null 2>/dev/null
+# Make archive of subset of core mesa object files for gallium
@@ -220,9 +196,9 @@ Index: mesa/src/mesa/Makefile
Index: mesa/configs/autoconf.in
===================================================================
---- mesa.orig/configs/autoconf.in 2011-06-27 10:35:46.000000000 +0100
-+++ mesa/configs/autoconf.in 2011-06-27 15:03:51.690937634 +0100
-@@ -121,6 +121,7 @@
+--- mesa.orig/configs/autoconf.in 2012-01-24 15:03:01.725902300 +0200
++++ mesa/configs/autoconf.in 2012-01-24 15:06:14.027663852 +0200
+@@ -124,6 +124,7 @@
DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
DRICORE_LIBS = @DRICORE_LIBS@
DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
commit 3534818e1db56f3f79a5d1cc68cd055bd072626c
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jan 24 14:49:00 2012 +0200
Update 115_llvm_dynamic_linking.diff to apply.
diff --git a/debian/changelog b/debian/changelog
index fbcac84..ca17b1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
118_fix_24bpp_software_renering.diff
119_r600g_gnome_shell_rendering_fix.diff:
- Included upstream.
+ * Update 115_llvm_dynamic_linking.diff to apply.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 24 Jan 2012 12:47:07 +0200
diff --git a/debian/patches/115_llvm_dynamic_linking.diff b/debian/patches/115_llvm_dynamic_linking.diff
index 3b0ff23..cbc629f 100644
--- a/debian/patches/115_llvm_dynamic_linking.diff
+++ b/debian/patches/115_llvm_dynamic_linking.diff
@@ -1,13 +1,13 @@
Index: mesa/configure.ac
===================================================================
---- mesa.orig/configure.ac 2011-06-27 14:47:42.000000000 +0100
-+++ mesa/configure.ac 2011-06-27 14:58:32.858835646 +0100
-@@ -1715,7 +1715,7 @@
+--- mesa.orig/configure.ac 2012-01-24 14:48:40.488101770 +0200
++++ mesa/configure.ac 2012-01-24 14:48:42.364157964 +0200
+@@ -1770,7 +1770,7 @@
if test "x$LLVM_CONFIG" != xno; then
- LLVM_VERSION=`$LLVM_CONFIG --version`
- LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
-- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
-+ LLVM_LIBS="-lLLVM-2.9 -lstdc++"
+ LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
+ LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
+- LLVM_LIBS="`$LLVM_CONFIG --libs`"
++ LLVM_LIBS="-lLLVM-2.9"
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
Reply to: