This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via c7c5a2cb0d27ffd3ab0a274c1e1aa3f85cc684ec (commit) via 23c2d096b7b2fff1fad47228e433a6585d56b9de (commit) via 1e964e1c9862ec847fcd4aebd475a658e003f2bc (commit) from f842bf6249aefcbafdab4b5d64d400c64aff19aa (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit c7c5a2cb0d27ffd3ab0a274c1e1aa3f85cc684ec Merge: 1e964e1 23c2d09 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 7 22:53:03 2012 +0200

Merge remote-tracking branch 'stevee/mesa'

commit 23c2d096b7b2fff1fad47228e433a6585d56b9de Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon May 7 21:06:14 2012 +0200

mesa: Update to 7.11.2.

Fix compile error's on ARM. Add selinux support Add pic support - now all libraries are full relro.

commit 1e964e1c9862ec847fcd4aebd475a658e003f2bc Author: Christian Schmidt christian.schmidt@ipfire.org Date: Mon May 7 18:16:33 2012 +0200

strace: Update to strace 4.7.

Fixes #10120

-----------------------------------------------------------------------

Summary of changes: mesa/mesa.nm | 36 ++++++++++++------- .../patches/strace-4.5.19-fix-kernel-headers.patch | 30 ---------------- strace/strace.nm | 6 ++-- 3 files changed, 26 insertions(+), 46 deletions(-) delete mode 100644 strace/patches/strace-4.5.19-fix-kernel-headers.patch

Difference in files: diff --git a/mesa/mesa.nm b/mesa/mesa.nm index b2212e9..d12624a 100644 --- a/mesa/mesa.nm +++ b/mesa/mesa.nm @@ -4,8 +4,8 @@ ###############################################################################

name = mesa -version = 7.8.2 -release = 3 +version = 7.11.2 +release = 1

groups = Development/Tools url = http://www.mesa3d.org @@ -16,12 +16,15 @@ description Mesa libGL runtime libraries and DRI drivers. end

-source_dl = +source_dl = ftp://ftp.freedesktop.org/pub/mesa/%{version}/ sources = MesaLib-%{version}.tar.bz2

build requires + bison expat-devel + flex + gcc-c++ pkg-config libX11-devel libXdamage-devel @@ -31,6 +34,7 @@ build libdrm-devel libselinux-devel libxcb-devel + makedepend xorg-x11-proto-devel end

@@ -38,25 +42,31 @@ build

CFLAGS += -Wl,-z,lazy

+ if "%{DISTRO_PLATFORM}" == "x86" + platform_drivers = ,i915,i965 + end + configure_options += \ --enable-pic \ + --enable-selinux \ + --enable-pic \ --with-driver=dri \ - --with-state-tracker=dri,glx \ + --with-dri-drivers="nouveau,radeon,r200%{platform_drivers}" \ + --with-gallium-drivers=swrast \ + --disable-asm \ --disable-glw \ --disable-glu \ --disable-glut \ - --disable-gl-osmesa \ - --disable-gallium \ - --disable-gallium-intel \ - --disable-gallium-svga \ - --disable-gallium-radeon \ - --disable-gallium-nouveau \ + --disable-gallium-llvm \ + --disable-gallium-egl \ --disable-egl \ + --disable-static \ --without-demos -end

-quality-agent - permit_not_full_relro = yes + prepare_cmds + # Defaults to dri (not xlib) for libGL on all arches. + sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac + end end

packages diff --git a/strace/patches/strace-4.5.19-fix-kernel-headers.patch b/strace/patches/strace-4.5.19-fix-kernel-headers.patch deleted file mode 100644 index 98cfb95..0000000 --- a/strace/patches/strace-4.5.19-fix-kernel-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ - -From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560516 - -This bug is due to linux header changes. The following patch, from -upstream, fixes the problem: - -diff -Nru strace-4.5.19/configure strace-4.5.19/configure ---- strace-4.5.19/configure 2009-10-21 19:41:11.000000000 +0200 -+++ strace-4.5.19/configure 2010-01-26 08:47:33.000000000 +0100 -@@ -5880,7 +5880,7 @@ - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h> --#include <linux/socket.h> -+#include <sys/socket.h> - " - eval as_val=$$as_ac_Header - if test "x$as_val" = x""yes; then : -diff -Nru strace-4.5.19/configure.ac strace-4.5.19/configure.ac ---- strace-4.5.19/configure.ac 2009-10-12 21:54:43.000000000 +0200 -+++ strace-4.5.19/configure.ac 2010-01-26 08:47:18.000000000 +0100 -@@ -258,7 +258,7 @@ - ], [], []) - AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], - [], [], [#include <stddef.h> --#include <linux/socket.h>]) -+#include <sys/socket.h>]) - AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>]) - AC_CHECK_TYPES([struct sigcontext_struct, - struct sigcontext],,, [#include <signal.h>]) diff --git a/strace/strace.nm b/strace/strace.nm index 7aec6d7..c6127cc 100644 --- a/strace/strace.nm +++ b/strace/strace.nm @@ -4,7 +4,7 @@ ###############################################################################

name = strace -version = 4.5.19 +version = 4.7 release = 1

groups = Development/Debuggers @@ -20,8 +20,8 @@ description purposes. end

-source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bthisapp... -sources = %{thisapp}.tar.bz2 +source_dl = http://downloads.sourceforge.net/project/%%7Bname%7D/%%7Bname%7D/%%7Bversion... +sources = %{thisapp}.tar.xz

build configure_options += \

hooks/post-receive -- IPFire 3.x development tree