Rebased ref, commits from common ancestor:
commit 1b2a61e8dee70b75d2c88c6cfcfd90462c055f10
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Feb 9 16:53:37 2012 +1100
Add libx11-xcb-dev to libegl1-mesa-dev depends.
We now have all the packages listed as Requires or Requires.private in
egl.pc. Yay!
diff --git a/debian/changelog b/debian/changelog
index 2de7fe3..b638dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
mesa (8.0~rc2-0ubuntu5) precise; urgency=low
+ [ Robert Hooker ]
* debian/control: Add libxcb-glx0-dev to libegl1-mesa-dev depends.
- -- Robert Hooker <sarv...@ubuntu.com> Fri, 03 Feb 2012 15:31:14 -0500
+ [ Christopher James Halse Rogers ]
+ * debian/control: Add libx11-xcb-dev to libegl1-mesa-dev depends.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 09 Feb 2012
16:49:26 +1100
mesa (8.0~rc2-0ubuntu4) precise; urgency=low
diff --git a/debian/control b/debian/control
index 3124507..649e3e4 100644
--- a/debian/control
+++ b/debian/control
@@ -261,6 +261,7 @@ Depends:
libxdamage-dev,
libxfixes-dev,
libxcb-glx0-dev,
+ libx11-xcb-dev,
${misc:Depends},
Description: free implementation of the EGL API -- development files
This package contains the development environment required for compiling
commit 429fa192b11263a4ed0799ddc9038a38afc1e585
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Fri Feb 3 15:31:57 2012 -0500
Bump changelog
diff --git a/debian/changelog b/debian/changelog
index 2e6d46e..2de7fe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (8.0~rc2-0ubuntu5) precise; urgency=low
+
+ * debian/control: Add libxcb-glx0-dev to libegl1-mesa-dev depends.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Fri, 03 Feb 2012 15:31:14 -0500
+
mesa (8.0~rc2-0ubuntu4) precise; urgency=low
* Drop drisearchdir handling, it is no longer needed with multiarch
commit 9856cc21a613b09f1dbc12f18f2d7cf295b86be7
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Fri Feb 3 00:15:16 2012 -0500
Release to precise
diff --git a/debian/changelog b/debian/changelog
index 35788c2..56f266f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (8.0~rc2-0ubuntu4) UNRELEASED; urgency=low
+mesa (8.0~rc2-0ubuntu4) precise; urgency=low
* Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.
commit 0a868b825b2433c44b6c2dc4d027fa9b9840c856
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Thu Feb 2 12:07:25 2012 -0500
Drop drisearchpath handling.
diff --git a/debian/changelog b/debian/changelog
index d07fcfa..35788c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0~rc2-0ubuntu4) UNRELEASED; urgency=low
+
+ * Drop drisearchdir handling, it is no longer needed with multiarch
+ and dri-alternates being removed.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Thu, 02 Feb 2012 12:05:48 -0500
+
mesa (8.0~rc2-0ubuntu3) precise; urgency=low
* Merge from debian-experimental git.
diff --git a/debian/patches/series b/debian/patches/series
index 8ccc3c9..50aa029 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@
# Ubuntu patches.
100_no_abi_tag.patch
101_ubuntu_hidden_glname.patch
-111_export_searchdirs_in_dripc.diff
113_fix_tls.diff
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
diff --git a/debian/rules b/debian/rules
index 9c2be62..26a9952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,7 +109,6 @@ confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
-
--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri'
\
--enable-glx-tls \
--enable-shared-dricore \
--enable-shared-glapi \
commit 9cf1bba1d91758e8e7b3d3145004ab8ec1c5ddde
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Feb 2 13:09:31 2012 +0200
release to precise
diff --git a/debian/changelog b/debian/changelog
index 35c170d..d07fcfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0~rc2-0ubuntu3) precise; urgency=low
+
+ * Merge from debian-experimental git.
+ - Install the llvmpipe swrast driver.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Feb 2012 12:38:06 +0200
+
mesa (8.0~rc2-0ubuntu2) precise; urgency=low
* Add Pre-Depends: dpkg (>= 1.15.6~) to all -dbg packages.
commit f0abd71d931e2f38b6da02738fbe47a46be654ec
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Jan 31 16:18:45 2012 +0200
fix Pre-Depends conflicts
diff --git a/debian/control b/debian/control
index bfa446a..aad4163 100644
--- a/debian/control
+++ b/debian/control
@@ -134,11 +134,11 @@ Package: libxatracker1-dbg
Section: debug
Priority: extra
Architecture: linux-any
-Pre-Depends: dpkg (>= 1.15.6~)
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Depends:
libxatracker1 (= ${binary:Version}),
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: X acceleration library -- debugging symbols
This package contains the XA (X acceleration) library. It is used exclusively
@@ -181,11 +181,11 @@ Package: libgbm1-dbg
Section: debug
Priority: extra
Architecture: linux-any
-Pre-Depends: dpkg (>= 1.15.6~)
+Pre-Depends: ${misc:Pre-Depends},
+ dpkg (>= 1.15.6~),
Depends:
libgbm1 (= ${binary:Version}),
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: generic buffer management API -- debugging symbols
This package contains the GBM buffer management library. It provides a
commit 00129fc956824a9a4abc118a98bc6f9db15ce966
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Jan 31 16:08:50 2012 +0200
Add Pre-Depends: dpkg (>= 1.15.6~) to all -dbg packages.
and release.
diff --git a/debian/changelog b/debian/changelog
index 0afc807..4eec23c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (8.0~rc2-0ubuntu2) precise; urgency=low
+
+ * Add Pre-Depends: dpkg (>= 1.15.6~) to all -dbg packages.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Tue, 31 Jan 2012 16:07:29 +0200
+
mesa (8.0~rc2-0ubuntu1) precise; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 7007c46..bfa446a 100644
--- a/debian/control
+++ b/debian/control
@@ -69,6 +69,7 @@ Package: libgl1-mesa-swx11-dbg
Section: debug
Priority: extra
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgl1-mesa-swx11 (= ${binary:Version}),
${misc:Depends},
@@ -133,6 +134,7 @@ Package: libxatracker1-dbg
Section: debug
Priority: extra
Architecture: linux-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libxatracker1 (= ${binary:Version}),
${misc:Depends},
@@ -179,6 +181,7 @@ Package: libgbm1-dbg
Section: debug
Priority: extra
Architecture: linux-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgbm1 (= ${binary:Version}),
${misc:Depends},
@@ -232,6 +235,7 @@ Package: libegl1-mesa-dbg
Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libegl1-mesa (= ${binary:Version}),
${misc:Depends},
@@ -288,6 +292,7 @@ Package: libegl1-mesa-drivers-dbg
Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libegl1-mesa-drivers (= ${binary:Version}),
${misc:Depends},
@@ -322,6 +327,7 @@ Package: libopenvg1-mesa-dbg
Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libopenvg1-mesa (= ${binary:Version}),
${misc:Depends},
@@ -376,6 +382,7 @@ Package: libgles1-mesa-dbg
Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgles1-mesa (= ${binary:Version}),
${misc:Depends},
@@ -433,6 +440,7 @@ Package: libgles2-mesa-dbg
Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgles2-mesa (= ${binary:Version}),
${misc:Depends},
@@ -484,6 +492,7 @@ Package: libglapi-mesa-dbg
Section: debug
Priority: extra
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libglapi-mesa (= ${binary:Version}),
${misc:Depends},
@@ -526,6 +535,7 @@ Package: libgl1-mesa-glx-dbg
Section: debug
Priority: extra
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgl1-mesa-glx (= ${binary:Version}),
${misc:Depends},
@@ -599,6 +609,7 @@ Package: libgl1-mesa-dri-dbg
Section: debug
Priority: extra
Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgl1-mesa-dri (= ${binary:Version}),
${misc:Depends},
@@ -647,6 +658,7 @@ Package: libgl1-mesa-dri-experimental-dbg
Section: debug
Priority: extra
Architecture: linux-any
+Pre-Depends: dpkg (>= 1.15.6~)
Depends:
libgl1-mesa-dri-experimental (= ${binary:Version}),
${misc:Depends},
commit 9e2f60e627e4f5dcd79657f1e617908c0430e6d8
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Jan 31 16:04:08 2012 +0200
update the changelog for release
diff --git a/debian/changelog b/debian/changelog
index 45d1a84..0afc807 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (8.0~rc2-0ubuntu1) UNRELEASED; urgency=low
+mesa (8.0~rc2-0ubuntu1) precise; urgency=low
[ Timo Aaltonen ]
* clean, rules: Move cleaning of xmlpool.pot to rules and remove
@@ -23,7 +23,7 @@ mesa (8.0~rc2-0ubuntu1) UNRELEASED; urgency=low
* debian/control: Bump libwayland-dev build requirements.
* Switch to llvm 3.0.
- -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 17:55:52 -0500
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 20:56:01 -0500
mesa (8.0~rc2-1) UNRELEASED; urgency=low
commit 600ea773b4dc54d184c020908cd7e9658feb78f1
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Tue Jan 31 00:35:41 2012 -0500
debian/changelog: Document change to llvm 3.0
diff --git a/debian/changelog b/debian/changelog
index 9c3dab0..45d1a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (8.0~rc2-0ubuntu1) UNRELEASED; urgency=low
* Fix up 116_use_shared_galliumcore.diff so it works.
* debian/rules: Fix up dh_shlibdeps call.
* debian/control: Bump libwayland-dev build requirements.
+ * Switch to llvm 3.0.
-- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 17:55:52 -0500
commit 258419229156c90aee1775327f7eeb15871df2cc
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Jan 30 20:55:46 2012 -0500
Switch to llvm-3.0
diff --git a/debian/control b/debian/control
index 916dfcb..7007c46 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.0-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.1.0~2-1),
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/patches/115_llvm_dynamic_linking.diff
b/debian/patches/115_llvm_dynamic_linking.diff
index cbc629f..d241a6a 100644
--- a/debian/patches/115_llvm_dynamic_linking.diff
+++ b/debian/patches/115_llvm_dynamic_linking.diff
@@ -7,7 +7,7 @@ Index: mesa/configure.ac
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_LIBS="-lLLVM-3.0"
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
diff --git a/debian/patches/13-llvm-config-pick-a-version.diff
b/debian/patches/13-llvm-config-pick-a-version.diff
index a4ad365..0350aa2 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -1,6 +1,9 @@
Several versions of llvm can coexist in the archive (at the time of this
writing, 2.8 and 2.9), so pick a version. Let's assume the last version
receives bug fixes quickly, so pick 2.9 for now.
+
+(Ammended 01/30/2012 - Sarvatt)
+Switch to 3.0 for ubuntu 12.04
Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac 2012-01-18 16:06:14.824947429 +0200
@@ -10,7 +13,7 @@ Index: mesa/configure.ac
fi
if test "x$enable_gallium_llvm" = xyes; then
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-2.9], [no])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.0], [no])
if test "x$LLVM_CONFIG" != xno; then
LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
commit c36d0d7527cfd42ae11212a279ca26dbac8c3b25
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Jan 30 17:56:58 2012 -0500
debian/control: Bump libwayland-dev build requirements.
diff --git a/debian/changelog b/debian/changelog
index 0ca4a9c..9c3dab0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,9 @@ mesa (8.0~rc2-0ubuntu1) UNRELEASED; urgency=low
no longer shipped upstream.
* Fix up 116_use_shared_galliumcore.diff so it works.
* debian/rules: Fix up dh_shlibdeps call.
+ * debian/control: Bump libwayland-dev build requirements.
- -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 16:25:36 -0500
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 17:55:52 -0500
mesa (8.0~rc2-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 8d83544..916dfcb 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
flex,
bison,
llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- libwayland-dev (>= 0.1.0~0.2-0ubuntu3),
+ libwayland-dev (>= 0.1.0~2-1),
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
commit 100f8ad4930b89daf0466173616b05a35367644c
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Jan 30 16:26:32 2012 -0500
debian/rules: Fix up dh_shlibdeps call.
diff --git a/debian/changelog b/debian/changelog
index d305fe4..62d6906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
* Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental,
no longer shipped upstream.
* Fix up 116_use_shared_galliumcore.diff so it works.
+ * debian/rules: Fix up dh_shlibdeps call.
- -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 15:52:13 -0500
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 16:25:36 -0500
mesa (8.0~rc1-1) UNRELEASED; urgency=low
diff --git a/debian/rules b/debian/rules
index 3b96a2d..32677aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -354,9 +354,8 @@ 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 18684ec4e72d01d8a4bf675b121a1d3f937c62e7
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Jan 30 15:52:45 2012 -0500
Fix up 116_use_shared_galliumcore.diff to work.
diff --git a/debian/changelog b/debian/changelog
index ae72071..d305fe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
[ Robert Hooker ]
* Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental,
no longer shipped upstream.
+ * Fix up 116_use_shared_galliumcore.diff so it works.
- -- Robert Hooker <sarv...@ubuntu.com> Tue, 24 Jan 2012 09:54:54 -0500
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 30 Jan 2012 15:52:13 -0500
mesa (8.0~rc1-1) UNRELEASED; urgency=low
diff --git a/debian/patches/116_use_shared_galliumcore.diff
b/debian/patches/116_use_shared_galliumcore.diff
index e202208..450ac2c 100644
--- a/debian/patches/116_use_shared_galliumcore.diff
+++ b/debian/patches/116_use_shared_galliumcore.diff
@@ -1,8 +1,8 @@
-Index: mesa/bin/mklib
-===================================================================
---- 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 @@
+diff --git a/bin/mklib b/bin/mklib
+index 2c7ed38..14bca63 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -147,6 +147,7 @@ ARCHOPT=""
NOPREFIX=0
EXPORTS=""
ID=""
@@ -10,7 +10,7 @@ Index: mesa/bin/mklib
#
# Parse arguments
-@@ -191,6 +192,18 @@
+@@ -191,6 +192,18 @@ do
-R*)
DEPS="$DEPS $1"
;;
@@ -29,7 +29,7 @@ Index: mesa/bin/mklib
-Wl*)
DEPS="$DEPS $1"
;;
-@@ -271,6 +284,10 @@
+@@ -271,6 +284,10 @@ if [ $STATIC = 1 ]; then
OBJECTS=$NEWOBJECTS
fi
@@ -40,7 +40,7 @@ Index: mesa/bin/mklib
#
# Error checking
-@@ -284,7 +301,6 @@
+@@ -284,7 +301,6 @@ if [ "x${OBJECTS}" = "x" ] ; then
exit 1
fi
@@ -48,7 +48,7 @@ Index: mesa/bin/mklib
#
# Debugging info
#
-@@ -343,6 +359,7 @@
+@@ -343,6 +359,7 @@ case $ARCH in
fi
rm -f ${LIBNAME}
@@ -56,33 +56,69 @@ Index: mesa/bin/mklib
# make lib
${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# finish up
-Index: mesa/configure.ac
-===================================================================
---- 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'
+diff --git a/configs/autoconf.in b/configs/autoconf.in
+index 37b7ea5..b479f2b 100644
+--- a/configs/autoconf.in
++++ b/configs/autoconf.in
+@@ -121,6 +121,7 @@ DRI_DIRS = @DRI_DIRS@
+ DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
+ DRICORE_LIBS = @DRICORE_LIBS@
+ DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
++GALLIUM_LIB_DEPS = @GALLIUM_LIB_DEPS@
+ EGL_PLATFORMS = @EGL_PLATFORMS@
+ EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
+
+diff --git a/configure.ac b/configure.ac
+index 0ea264e..684f5b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1036,6 +1036,41 @@ AC_SUBST([GLESv2_PC_LIB_PRIV])
+ 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'
+ 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)'
-@@ -1102,6 +1103,7 @@
- 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)'
++ fi
++ fi
++fi
++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])
-Index: mesa/src/gallium/Makefile.template
-===================================================================
---- 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 @@
++AC_SUBST([DRI_CXXFLAGS])
++AC_SUBST([DRI_CFLAGS])
++AC_SUBST([MESA_MODULES])
+
+ dnl Setup default DRI CFLAGS
+ DRI_CFLAGS='$(CFLAGS)'
+diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
+index 036c119..3f01d08 100644
+--- a/src/gallium/Makefile.template
++++ b/src/gallium/Makefile.template
+@@ -30,7 +30,7 @@ endif
##### TARGETS #####
@@ -91,7 +127,7 @@ Index: mesa/src/gallium/Makefile.template
lib$(LIBNAME).a: $(OBJECTS) $(EXTRA_OBJECTS) Makefile
$(TOP)/src/gallium/Makefile.template
$(MKLIB) -o $(LIBNAME) -static $(OBJECTS) $(EXTRA_OBJECTS)
-@@ -58,16 +58,16 @@
+@@ -58,16 +58,16 @@ install:
##### RULES #####
%.s: %.c
@@ -112,11 +148,11 @@ Index: mesa/src/gallium/Makefile.template
sinclude depend
-Index: mesa/src/gallium/auxiliary/Makefile
-===================================================================
---- 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 @@
+diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
+index 7dae7bc..9a08acb 100644
+--- a/src/gallium/auxiliary/Makefile
++++ b/src/gallium/auxiliary/Makefile
+@@ -213,6 +213,14 @@ endif
include ../Makefile.template
@@ -131,18 +167,18 @@ Index: mesa/src/gallium/auxiliary/Makefile
indices/u_indices_gen.c: indices/u_indices_gen.py
$(PYTHON2) $< > $@
-@@ -33,4 +41,6 @@
+@@ -228,4 +236,6 @@ util/u_format_table.c: util/u_format_table.py
util/u_format_pack.py util/u_forma
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 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 @@
+diff --git a/src/gallium/targets/Makefile.dri
b/src/gallium/targets/Makefile.dri
+index 857ebfe..bb08ba0 100644
+--- a/src/gallium/targets/Makefile.dri
++++ b/src/gallium/targets/Makefile.dri
+@@ -9,7 +9,6 @@ LDFLAGS += -lstdc++
endif
MESA_MODULES = \
@@ -150,7 +186,7 @@ Index: mesa/src/gallium/targets/Makefile.dri
$(GALLIUM_AUXILIARIES)
COMMON_GALLIUM_SOURCES = \
-@@ -73,8 +72,8 @@
+@@ -78,8 +77,8 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS)
Makefile \
$(MKLIB) -o $@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
$(OBJECTS) $(PIPE_DRIVERS) \
-Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
@@ -161,30 +197,31 @@ Index: mesa/src/gallium/targets/Makefile.dri
@rm -f $@.test
mv -f $@.tmp $@
-Index: mesa/src/mesa/Makefile
-===================================================================
---- 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))
+diff --git a/src/mesa/Makefile b/src/mesa/Makefile
+index a903a26..c4ab43c 100644
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -17,6 +17,9 @@ MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/,
$(MESA_GALLIUM_OBJECTS))
+ DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_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)
-@@ -65,7 +67,7 @@
+@@ -66,7 +69,7 @@ $(DRICORE_OBJ_DIR)/%.o: %.S
# 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
- # 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) \
+ 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 @@ depend: $(ALL_SOURCES)
+ @$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
$(ALL_SOURCES) > /dev/null 2>/dev/null
+# Make archive of subset of core mesa object files for gallium
@@ -194,15 +231,3 @@ Index: mesa/src/mesa/Makefile
######################################################################
# Installation rules
-Index: mesa/configs/autoconf.in
-===================================================================
---- 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@
-+GALLIUM_LIB_DEPS = @GALLIUM_LIB_DEPS@
- EGL_PLATFORMS = @EGL_PLATFORMS@
- EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
-
commit 3fe658a756430acbec0be07f51548f73d5b49757
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Thu Jan 26 10:59:15 2012 -0500
debian/rules: Don't build swx11+glu-i386-i686 target.
diff --git a/debian/rules b/debian/rules
index 7278f5a..3b96a2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,6 @@ CONFIGS = swx11+glu \
osmesa32 \
osmesa32-static
-ifeq ($(DEB_HOST_ARCH_CPU), i386)
- CONFIGS += swx11+glu-i386-i686
-endif
-
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
commit bd406479fe06738b6fbd8d03cb725f0e6242e97f
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Thu Jan 26 10:29:13 2012 -0500
debian/not-installed: Drop i686 files from here, we dont build them in
ubuntu
diff --git a/debian/not-installed b/debian/not-installed
index afbf7dc..869f017 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -20,19 +20,6 @@ NOT_INSTALLED := \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
-# Architecture-specific additional files:
-NOT_INSTALLED_i386 = \
- usr/lib/*/i686/cmov/libGL.so \
- usr/lib/*/i686/cmov/libGLU.so \
- usr/lib/*/i686/cmov/libGLU.so.1 \
- usr/lib/*/i686/cmov/libGLU.so.1.* \
- usr/lib/*/i686/cmov/libOSMesa.so \
- usr/lib/*/i686/cmov/libOSMesa.so.6 \
- usr/lib/*/i686/cmov/libOSMesa.so.6.* \
- usr/lib/*/i686/cmov/pkgconfig/glu.pc \
- usr/lib/*/i686/cmov/pkgconfig/gl.pc \
- usr/lib/*/i686/cmov/pkgconfig/osmesa.pc
-
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
NOT_INSTALLED_hurd-i386 = $(NOT_INSTALLED_i386)
commit a4380bf54282e9666468e111d644ce88f3e363af
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Jan 25 00:34:56 2012 +0200
rules: Drop the dri-alternates driver search path
and don't ship gallium version of i915_dri.so for now.
diff --git a/debian/changelog b/debian/changelog
index f1754ba..ae72071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
- Included upstream.
* Update 115_llvm_dynamic_linking.diff,
116_use_shared_galliumcore.diff to apply.
+ * rules: Drop the dri-alternates driver search path, and don't ship
+ gallium version of i915_dri.so for now.
[ Robert Hooker ]
* Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental,
diff --git a/debian/rules b/debian/rules
index 13d4aff..7278f5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -191,13 +190,6 @@ confflags-swx11+glu-i386-i686 = \
CFLAGS="$(CFLAGS) -march=i686" \
CXXFLAGS="$(CXXFLAGS) -march=i686"
-# Add /usr/lib/dri-alternates for classic fallback for gallium drivers
-ifeq ($(DEB_BUILD_ARCH),i386)
- confflags-dri +=
--with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri:/usr/lib/$(DEB_HOST_MULTIARCH)/dri-alternates:/usr/lib/dri-alternates:/usr/lib32/dri:/usr/lib32/dri-alternates
-else
- confflags-dri +=
--with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri:/usr/lib/$(DEB_HOST_MULTIARCH)/dri-alternates:/usr/lib/dri-alternates
-endif
-
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
@@ -317,9 +309,6 @@ endif
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
-ifneq (,$(filter i915,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri-experimental
build/dri/$(DEB_HOST_MULTIARCH)/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
-endif
# Create an ld.so.conf which says where to find libGL from Mesa
echo "/usr/lib/$(DEB_HOST_MULTIARCH)/mesa" \
commit 8c7136e754ad61988df564696c712da8644fb710
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Tue Jan 24 10:08:56 2012 -0500
debian/patches: Remove more upstream patches.
diff --git a/debian/patches/104_i915_fragment_shader_disable.patch
b/debian/patches/104_i915_fragment_shader_disable.patch
deleted file mode 100644
index d2aee8e..0000000
--- a/debian/patches/104_i915_fragment_shader_disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarv...@ubuntu.com>
-Date: Wed, 8 Sep 2010 12:33:09 -0400
-Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
-
-This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
----
- src/mesa/drivers/dri/intel/intel_screen.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
-index 0a542a7..8ae2cd2 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
- DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable,
945-only).")
- DRI_CONF_OPT_END
-
-- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
-+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
- DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on
915/945.")
- DRI_CONF_OPT_END
-
---
-1.7.2
-
diff --git a/debian/patches/105_use_shared_libdricore.patch
b/debian/patches/105_use_shared_libdricore.patch
deleted file mode 100644
index 6c6e4d0..0000000
--- a/debian/patches/105_use_shared_libdricore.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-commit 2bf2b08a97a65327bfb9d511f3cc6792aa560cbc
-Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
-Date: Wed Nov 17 14:28:34 2010 +1100
-
- mesa: Optionally build a dricore support library.
-
- This an adds --enable-shared-dricore option to configure. When enabled,
- DRI modules will link against a shared copy of the common mesa routines
- rather than statically linking these.
-
- This saves about 30MB on disc with a full complement of classic DRI
- drivers.
-
-Index: mesa/configs/autoconf.in
-===================================================================
---- mesa.orig/configs/autoconf.in 2011-04-11 11:17:43.692242067 +1000
-+++ mesa/configs/autoconf.in 2011-04-11 11:18:11.463257267 +1000
-@@ -33,6 +33,8 @@
- LLVM_LIBS = @LLVM_LIBS@
- GLW_CFLAGS = @GLW_CFLAGS@
- GLUT_CFLAGS = @GLUT_CFLAGS@
-+DRI_CFLAGS = @DRI_CFLAGS@
-+DRI_CXXFLAGS = @DRI_CXXFLAGS@
-
- # dlopen
- DLOPEN_LIBS = @DLOPEN_LIBS@
-@@ -100,7 +102,10 @@
- GALLIUM_DRIVERS = $(foreach
DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-
- # Driver specific build vars
--DRI_DIRS = @DRI_DIRS@
-+DRI_DIRS = @DRI_DIRS@
-+DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
-+DRICORE_LIBS = @DRICORE_LIBS@
-+DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
- EGL_PLATFORMS = @EGL_PLATFORMS@
- EGL_CLIENT_APIS = @EGL_CLIENT_APIS@
-
-@@ -128,6 +133,7 @@
- VG_LIB_DEPS = $(EXTRA_LIB_PATH) @VG_LIB_DEPS@
-
- # DRI dependencies
-+MESA_MODULES = @MESA_MODULES@
- DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@
- LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
- LIBDRM_LIB = @LIBDRM_LIBS@
-Index: mesa/configs/default
-===================================================================
---- mesa.orig/configs/default 2011-04-11 11:17:43.722243160 +1000
-+++ mesa/configs/default 2011-04-11 11:18:11.463257267 +1000
-@@ -82,6 +82,9 @@
- GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)*
- VG_LIB_GLOB = $(VG_LIB_NAME)*
-
-+DRI_CFLAGS = $(CFLAGS)
-+DRI_CXXFLAGS = $(CXXFLAGS)
-+
- # Optional assembly language optimization files for libGL
- MESA_ASM_SOURCES =
-
-Index: mesa/configs/freebsd-dri
-===================================================================
---- mesa.orig/configs/freebsd-dri 2011-04-11 11:17:43.702242435 +1000
-+++ mesa/configs/freebsd-dri 2011-04-11 11:18:11.463257267 +1000
-@@ -30,9 +30,11 @@
- MESA_ASM_SOURCES =
-
- # Library/program dependencies
-+MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+
- LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
- LIBDRM_LIB = `pkg-config --libs libdrm`
--
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/e1s0uhl-0005yj...@vasks.debian.org
