debian/Xsession.d_65mesa-check-x86-64 | 15 --------------- debian/changelog | 19 +++++++++++++++++++ debian/libgl1-mesa-dri.install | 1 - debian/rules | 6 +++--- 4 files changed, 22 insertions(+), 19 deletions(-)
New commits: commit 3bfa064713171fd0f8e1004f7b1906fbf3ab541b Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Fri Dec 12 02:18:00 2008 +0200 debian/rules: Add -D_GNU_SOURCE for lpia & armel (FTBFS). diff --git a/debian/changelog b/debian/changelog index b8665a9..9c783bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +mesa (7.2+git20081209.a0d5c3cf-0ubuntu4) jaunty; urgency=low + + * debian/rules: Add -D_GNU_SOURCE for lpia & armel (FTBFS). + + -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 12 Dec 2008 02:15:40 +0200 + mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low * debian/rules (CFLAGS): Avoid recursive reference. - -- Matthias Klose < d...@ubuntu.com> Thu, 11 Dec 2008 22:34:43 +0100 + -- Matthias Klose <d...@ubuntu.com> Thu, 11 Dec 2008 22:34:43 +0100 mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) jaunty; urgency=low diff --git a/debian/rules b/debian/rules index de9ef72..eb4f0f3 100755 --- a/debian/rules +++ b/debian/rules @@ -77,9 +77,9 @@ else ifeq ($(DEB_HOST_ARCH), sparc) DRI_DRIVERS += ffb else ifeq ($(DEB_HOST_ARCH), lpia) DRI_DRIVERS = i915 i965 - CFLAGS += -D_BSD_SOURCE + CFLAGS += -D_BSD_SOURCE -D_GNU_SOURCE else ifeq ($(DEB_HOST_ARCH), armel) - CFLAGS += -D_BSD_SOURCE + CFLAGS += -D_BSD_SOURCE -D_GNU_SOURCE endif confflags-dri = \ commit de4e3e1e7b3c5d179e80d03688024b496307ce36 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Fri Dec 12 02:00:02 2008 +0200 fix the changelog diff --git a/debian/changelog b/debian/changelog index ceda3ea..b8665a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low - * Fix the CFLAGS for lpia/armel (FTBFS). + * debian/rules (CFLAGS): Avoid recursive reference. - -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 12 Dec 2008 00:05:15 +0200 + -- Matthias Klose < d...@ubuntu.com> Thu, 11 Dec 2008 22:34:43 +0100 mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) jaunty; urgency=low commit 1f5b26e11bbe000fe826d61119831dc8f05b56d2 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Fri Dec 12 00:05:57 2008 +0200 Fix the CFLAGS for lpia/armel (FTBFS). diff --git a/debian/changelog b/debian/changelog index 538dfba..ceda3ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low + + * Fix the CFLAGS for lpia/armel (FTBFS). + + -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 12 Dec 2008 00:05:15 +0200 + mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) jaunty; urgency=low * debian/rules: Add -D_BSD_SOURCE to CFLAGS for lpia & armel (FTBFS). diff --git a/debian/rules b/debian/rules index 7d21a96..de9ef72 100755 --- a/debian/rules +++ b/debian/rules @@ -77,9 +77,9 @@ else ifeq ($(DEB_HOST_ARCH), sparc) DRI_DRIVERS += ffb else ifeq ($(DEB_HOST_ARCH), lpia) DRI_DRIVERS = i915 i965 - CFLAGS="$(CFLAGS) -D_BSD_SOURCE" + CFLAGS += -D_BSD_SOURCE else ifeq ($(DEB_HOST_ARCH), armel) - CFLAGS="$(CFLAGS) -D_BSD_SOURCE" + CFLAGS += -D_BSD_SOURCE endif confflags-dri = \ commit 86f3119b2efb371b772cf3478b77d709d8647112 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Thu Dec 11 23:25:19 2008 +0200 fix the changelog diff --git a/debian/changelog b/debian/changelog index b9284a8..538dfba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,9 @@ -mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low +mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) jaunty; urgency=low * debian/rules: Add -D_BSD_SOURCE to CFLAGS for lpia & armel (FTBFS). - - -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Dec 2008 23:20:47 +0200 - -mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) UNRELEASED; urgency=low - * Drop the Xsession.d hook, not needed anymore. - -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 10 Dec 2008 19:47:59 +0200 + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Dec 2008 23:20:47 +0200 mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) jaunty; urgency=low commit d1e4c1b934db4858c4bc6118662b828849ee1fb5 Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Thu Dec 11 23:24:05 2008 +0200 debian/rules: Add -D_BSD_SOURCE to CFLAGS for lpia & armel (FTBFS). diff --git a/debian/changelog b/debian/changelog index ed9aa67..b9284a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (7.2+git20081209.a0d5c3cf-0ubuntu3) jaunty; urgency=low + + * debian/rules: Add -D_BSD_SOURCE to CFLAGS for lpia & armel (FTBFS). + + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 11 Dec 2008 23:20:47 +0200 + mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) UNRELEASED; urgency=low * Drop the Xsession.d hook, not needed anymore. diff --git a/debian/rules b/debian/rules index cfe202e..7d21a96 100755 --- a/debian/rules +++ b/debian/rules @@ -77,6 +77,9 @@ else ifeq ($(DEB_HOST_ARCH), sparc) DRI_DRIVERS += ffb else ifeq ($(DEB_HOST_ARCH), lpia) DRI_DRIVERS = i915 i965 + CFLAGS="$(CFLAGS) -D_BSD_SOURCE" +else ifeq ($(DEB_HOST_ARCH), armel) + CFLAGS="$(CFLAGS) -D_BSD_SOURCE" endif confflags-dri = \ commit fb82f88c65ea5cf7fc759d987afa2b01b6018c1e Author: Timo Aaltonen <tjaal...@cc.hut.fi> Date: Wed Dec 10 19:56:49 2008 +0200 Drop the Xsession.d hook, not needed anymore. diff --git a/debian/Xsession.d_65mesa-check-x86-64 b/debian/Xsession.d_65mesa-check-x86-64 deleted file mode 100644 index f0df1de..0000000 --- a/debian/Xsession.d_65mesa-check-x86-64 +++ /dev/null @@ -1,15 +0,0 @@ -: -# /etc/X11/Xsession.d/65mesa-check-x86-64 - -# This file is sourced by Xsession(5), not executed. - -# If we are running the 64-bit mesa code, we need to disable ASM -# optimizations if we are on a non-AMD processor without 3dnow instructions -# (until this get fixed in the mesa libraries) - -if [ `dpkg --print-architecture` = "amd64" ] && - ! grep -q "^flags.*3dnow" /proc/cpuinfo -then - MESA_NO_ASM=1 - export MESA_NO_ASM -fi diff --git a/debian/changelog b/debian/changelog index 3540574..ed9aa67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (7.2+git20081209.a0d5c3cf-0ubuntu2) UNRELEASED; urgency=low + + * Drop the Xsession.d hook, not needed anymore. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 10 Dec 2008 19:47:59 +0200 + mesa (7.2+git20081209.a0d5c3cf-0ubuntu1) jaunty; urgency=low * Merge from debian-experimental git branch. diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install index 4d61dbe..55500c8 100644 --- a/debian/libgl1-mesa-dri.install +++ b/debian/libgl1-mesa-dri.install @@ -1,2 +1 @@ usr/lib/dri/*.so -etc/X11/Xsession.d/65mesa-check-x86-64 diff --git a/debian/rules b/debian/rules index 73d937e..cfe202e 100755 --- a/debian/rules +++ b/debian/rules @@ -192,9 +192,6 @@ install: install-%: $(STAMP)-build-% cd $(DEB_BUILD_DIR)/$* && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - mkdir -p debian/tmp/etc/X11/Xsession.d - cp debian/Xsession.d_65mesa-check-x86-64 \ - debian/tmp/etc/X11/Xsession.d/65mesa-check-x86-64 touch $@ clean: unpatch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org