diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-09 00:41:01 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-09 00:41:01 +0800 |
| commit | 5e7088bdd9c2a677b1625640a6fd44908d8f1f50 (patch) | |
| tree | b386c58b3a83394c7a44a7e57908440483da49a2 | |
| parent | 230caf5cf3ea76badd3c79f8a0357300b7ff1559 (diff) | |
| download | xorg-devel-ports-5e7088bdd9c2a677b1625640a6fd44908d8f1f50.tar.gz xorg-devel-ports-5e7088bdd9c2a677b1625640a6fd44908d8f1f50.tar.zst xorg-devel-ports-5e7088bdd9c2a677b1625640a6fd44908d8f1f50.zip | |
Merge r763:
Update to 2.21.5
Merge r767:
Readd distinfo for 2.7.1
Merge r792-r793
Update to 2.21.6
Remove no longer needed patch and fix build.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@802 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11-drivers/xf86-video-intel/Makefile | 5 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-intel/distinfo | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-intel/files/extra-configure-sna | 11 |
3 files changed, 4 insertions, 16 deletions
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index a80c75d..437bb4c 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -27,7 +27,7 @@ USE_XORG= glproto \ MAN4= intel.4x .if defined(WITH_NEW_XORG) -INTEL_VERSION= 2.21.4 +INTEL_VERSION= 2.21.6 INTEL_REVISION= 0 CONFIGURE_ARGS+= --enable-sna MAKE_JOBS_UNSAFE=yes @@ -36,8 +36,7 @@ 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 + ${PATCHDIR}/extra-i915kms LIB_DEPENDS+= xcb-util:${PORTSDIR}/x11/xcb-util .else INTEL_VERSION= 2.7.1 diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo index a563486..9044ccc 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.21.4.tar.bz2) = 2f5983627013170db5b53d5c3ca7ad5fe843f3a0fa16ea136d6a4aa684c9cb03 -SIZE (xorg/driver/xf86-video-intel-2.21.4.tar.bz2) = 1713743 +SHA256 (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9 +SIZE (xorg/driver/xf86-video-intel-2.21.6.tar.bz2) = 1721176 diff --git a/x11-drivers/xf86-video-intel/files/extra-configure-sna b/x11-drivers/xf86-video-intel/files/extra-configure-sna deleted file mode 100644 index b26efcf..0000000 --- a/x11-drivers/xf86-video-intel/files/extra-configure-sna +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2012-10-26 13:05:01.098919480 +0300 -+++ configure 2012-10-26 13:05:05.145919575 +0300 -@@ -18498,7 +18498,7 @@ - _ACEOF - - else -- SNA=no -+# SNA=no - fi - - done |