Ticket #56983: xorg-server-devel.2.patch

x11/xorg-server-devel/Portfile

@@ -4 +4 @@
 name            xorg-server-devel
 conflicts       xorg-server
 set my_name     xorg-server
-version         1.19.99.1
+# version               1.19.99.1
 categories      x11 devel
 license         X11
 maintainers     {jeremyhu @jeremyhu} openmaintainer
@@ -15 +15 @@
 
 fetch.type      git
 git.url         git://anongit.freedesktop.org/xorg/xserver
-git.branch      d16133e3e293fe16b291114d344fbd5a61d5ed65
-#git.branch      xorg-server-${version}
+# git.branch      d16133e3e293fe16b291114d344fbd5a61d5ed65
+# the last commit that still builds against randrproto 1.5
+# (randrproto 1.6 hasn't been released yet?!)
+# xorg-server-1.19.0-636-gfabbaa8d6
+git.branch      fabbaa8d6260da14fe5b7ca0f3f8748af16253a2
+
+version         1.19.0.636
+# for git-describe based versioning:
+epoch           1
+
+worksrcdir      xorg-server-git
+distname        xorg-server-git
 
 use_parallel_build yes
 
@@ -83 +93 @@
         --disable-dri2 \
         --disable-dri3
 
+variant dri2 description {enable DRI2 support} {
+    configure.args-replace \
+        --disable-dri2 \
+        --enable-dri2
+    depends_build-append \
+        port:xorg-dri2proto
+}
+
+variant dri3 description {enable DRI3 support} {
+    configure.args-replace \
+        --disable-dri3 \
+        --enable-dri3
+    depends_build-append \
+        port:xorg-dri3proto
+}
+
 # GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
 configure.cppflags-append -I/usr/include -I${filespath}/dri -F${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework/Frameworks
 
@@ -92 +118 @@
 patchfiles \
         0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
         0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
-        0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
         5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
         5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
         5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
         5003-Use-old-miTrapezoids-and-miTriangles-routines.patch \
         5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
-        5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
+        5005-fb-Revert-fb-changes-that-broke-XQuartz.patch \
+        patch-revert-free-fbconfigs-on-destroy.diff
 
 patch.pre_args -p1
 
-use_autoreconf yes
+pre-configure {
+    use_autoreconf [expr ![file exists ${worksrcpath}/config.log]]
+}
 autoreconf.args -fvi
 
 build.args V=1
@@ -115 +143 @@
         ln -s Xquartz ${destroot}${prefix}/bin/X
 }
 
+post-activate {
+    set app "/Applications/MacPorts/X11.app/Contents/MacOS/X11.bin"
+    set identity "-"
+    ui_debug "Signing ${app} with identity \"${identity}\""
+    if {[catch {system "codesign -s ${identity} --preserve-metadata -f -vvv --deep ${app}"} err]} {
+        ui_error "Signing ${app} with ${identity}: ${err}"
+    }
+}
+
 platform macosx {
         if { ${os.major} < 10 } {
                 # Xplugin.h is missing on Tiger and incorrect on Leopard