diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-02-13 01:20:54 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-02-13 01:20:54 +0800 |
| commit | 325056bc74fea34791a28d366fa5df79c4c78360 (patch) | |
| tree | 1041af904003168b62b1bb106598cf9fa6fdb3a5 | |
| parent | dc1ec87a1a026041bf3f1bdc5f5d05bce3a16e2e (diff) | |
| download | xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar.gz xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar.bz2 xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar.lz xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar.xz xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.tar.zst xorg-devel-ports-325056bc74fea34791a28d366fa5df79c4c78360.zip | |
Update to 2.21.2.
Tested by: avg and sperber
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@670 058c260c-8361-11dd-a0ac-aa2bafec7d09
4 files changed, 37 insertions, 5 deletions
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index 3bf1eec..2e3a9d0 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -18,15 +18,15 @@ USE_XORG= xvmc xineramaproto x11 xf86driproto glproto MAN4= intel.4x .if defined(WITH_NEW_XORG) -INTEL_VERSION= 2.20.15 +INTEL_VERSION= 2.21.2 INTEL_REVISION= 0 CONFIGURE_ARGS+= --enable-sna MAKE_JOBS_UNSAFE=yes -SUP_FILES= ${PATCHDIR}/pkg-message-new.in -#PKGMESSAGE= ${PKGDIR}/pkg-message PLIST_SUB+= OLD="@comment " EXTRA_PATCHES+= ${PATCHDIR}/extra-clang \ + ${PATCHDIR}/extra-src_sna_compiler.h \ ${PATCHDIR}/extra-src_sna_kgem.c \ + ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${PATCHDIR}/extra-i915kms \ ${PATCHDIR}/extra-configure-sna LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index 8897054..eab6af9 100644 --- a/x11-drivers/xf86-video-intel/distinfo +++ b/x11-drivers/xf86-video-intel/distinfo @@ -1,4 +1,4 @@ SHA256 (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 255c0d54249cc0132f743254a43c21fac695fab2139c8ed96a07cf3c628e5f42 SIZE (xorg/driver/xf86-video-intel-2.7.1.tar.bz2) = 780625 -SHA256 (xorg/driver/xf86-video-intel-2.20.15.tar.bz2) = 09ba6878746193951b5471d9ed54fa6115fea97477ed33d0b9bd9b8cafd9e163 -SIZE (xorg/driver/xf86-video-intel-2.20.15.tar.bz2) = 1654806 +SHA256 (xorg/driver/xf86-video-intel-2.21.2.tar.bz2) = 2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850 +SIZE (xorg/driver/xf86-video-intel-2.21.2.tar.bz2) = 1696958 diff --git a/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c new file mode 100644 index 0000000..57361b9 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-src__sna__sna_threads.c @@ -0,0 +1,14 @@ +--- src/sna/sna_threads.c.orig 2013-02-02 00:03:44.000000000 +0000 ++++ src/sna/sna_threads.c 2013-02-02 00:04:39.000000000 +0000 +@@ -94,7 +94,11 @@ + size_t len = 0; + char *line = NULL; + uint32_t processors = 0, cores = 0; ++#ifdef __GLIBC__ + while (getline(&line, &len, file) != -1) { ++#else ++ while ((line = fgetln(file, &len)) != (char *) NULL) { ++#endif + int id; + if (sscanf(line, "physical id : %d", &id) == 1) { + if (id >= 32) diff --git a/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h new file mode 100644 index 0000000..aa7a435 --- /dev/null +++ b/x11-drivers/xf86-video-intel/files/extra-src_sna_compiler.h @@ -0,0 +1,18 @@ +--- src/sna/compiler.h.orig 2013-02-02 00:01:23.000000000 +0000 ++++ src/sna/compiler.h 2013-02-02 00:01:33.000000000 +0000 +@@ -36,7 +36,6 @@ + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-#define __packed__ __attribute__((__packed__)) + #else + #define likely(expr) (expr) + #define unlikely(expr) (expr) +@@ -45,7 +44,6 @@ + #define fastcall + #define must_check + #define constant +-#define __packed__ + #endif + + #ifdef HAVE_VALGRIND |