Merge pull request #603 from proski/x11rdp

Some good things extracted from the X11rdp MacOS port

8 files changed, 69 insertions, 27 deletions

diff --git a/xorg/X11R7.6/Mesa-7.10.3.patch b/xorg/X11R7.6/Mesa-7.10.3.patch
new file mode 100644
index 00000000..5171d388
--- /dev/null
+++ b/xorg/X11R7.6/Mesa-7.10.3.patch
@@ -0,0 +1,11 @@
+--- a/src/mesa/x86-64/xform4.S
++++ b/src/mesa/x86-64/xform4.S
+@@ -118,7 +118,7 @@
+ .byte  0x00, 0x00, 0x00, 0x00
+ .byte  0x00, 0x00, 0x00, 0x00
+ .byte  0x00, 0x00, 0x00, 0x00
+-.float 0f+1.0
++.float 1.0
+ 
+ .text
+ .align 16
diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index 0c61b5e1..bf871744 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -25,15 +25,23 @@
 
 download_all_files()
 {
-    # download files parallelly using keepalive
-    # a little bit faster than calling wget with single file more than 100 times
-    < x11_file_list.txt cut -f1 -d: | sed -e "s|^|${download_url}/|" | \
+    # download files in parallel using keepalive - a little bit faster
+    # than calling wget for a single file more than 100 times
+    urls=
+    for f in `cut -f1 -d: x11_file_list.txt`; do
+        if ! test -s "downloads/$f"; then
+            urls="$urls ${download_url}/$f"
+        fi
+    done
+    if test -n "$urls"; then
+        echo $urls | \
         xargs -P2 -n $(expr $num_modules / 2 + 1) \
         wget \
           --directory-prefix=downloads \
           --no-verbose \
           --timestamping \
           --continue
+    fi
 
     status=$?
     return $status
@@ -278,7 +286,7 @@ fi
 
 # this will copy the build X server with the other X server binaries
 cd rdp
-cp X11rdp $X11RDPBASE/bin
+cp X11rdp $X11RDPBASE/bin/X11rdp
 strip $X11RDPBASE/bin/X11rdp
 
 if [ "$2" = "drop" ]; then
diff --git a/xorg/X11R7.6/libpciaccess-0.12.0.patch b/xorg/X11R7.6/libpciaccess-0.12.0.patch
new file mode 100644
index 00000000..7d45d0b2
--- /dev/null
+++ b/xorg/X11R7.6/libpciaccess-0.12.0.patch
@@ -0,0 +1,24 @@
+diff -ur a/src/common_interface.c b/src/common_interface.c
+--- a/src/common_interface.c
++++ b/src/common_interface.c
+@@ -51,6 +51,20 @@
+ # define HTOLE_32(x)   (x)
+ #endif /* linux */
+ 
++#elif defined(__GNUC__) || defined(__clang__)
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define LETOH_16(x)   __builtin_bswap16(x)
++# define HTOLE_16(x)   __builtin_bswap16(x)
++# define LETOH_32(x)   __builtin_bswap32(x)
++# define HTOLE_32(x)   __builtin_bswap32(x)
++#else
++# define LETOH_16(x)   (x)
++# define HTOLE_16(x)   (x)
++# define LETOH_32(x)   (x)
++# define HTOLE_32(x)   (x)
++#endif /* gcc or clang */
++
+ #elif defined(__sun)
+ 
+ #include <sys/byteorder.h>
diff --git a/xorg/X11R7.6/pixman-0.30.0.patch b/xorg/X11R7.6/pixman-0.30.0.patch
new file mode 100644
index 00000000..35acdc51
--- /dev/null
+++ b/xorg/X11R7.6/pixman-0.30.0.patch
@@ -0,0 +1,11 @@
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -89,7 +89,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B)
+     return __A;
+ }
+ 
+-#  ifdef __OPTIMIZE__
++#  if defined(__OPTIMIZE__) && !defined(__clang__)
+ extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
+ _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
+ {
diff --git a/xorg/X11R7.6/rdp/Makefile b/xorg/X11R7.6/rdp/Makefile
index cdfea385..5debf3d2 100644
--- a/xorg/X11R7.6/rdp/Makefile
+++ b/xorg/X11R7.6/rdp/Makefile
@@ -49,20 +49,12 @@ LLIBS = -Wl,-rpath=$(LIBBASE) -lfreetype -lz -lm -lXfont -lXau \
 	-lXdmcp -lpixman-1 -lrt -ldl -lcrypto -lGL -lXdamage
 
 CFLAGS = -g -O2 -Wall -fno-strength-reduce \
-	-I../../include \
-	-I../../cfb \
-	-I../../mfb \
-	-I../../mi \
 	-I$(INCBASE) \
 	-I$(INCBASE)/X11 \
 	-I$(INCBASE)/X11/fonts \
 	-I$(INCBASE)/X11/extensions \
 	-I$(INCBASE)/xorg \
 	-I$(INCBASE)/pixman-1 \
-	-I../../os \
-	-I../../render \
-	-I../xfree86/common \
-	-I../xfree86/os-support \
 	-I../../../common \
 	-D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_REENTRANT \
 	-DGLX_USE_MESA -DXRECORD -D_GNU_SOURCE -DXAPPGROUP \
diff --git a/xorg/X11R7.6/rdp/rdp.h b/xorg/X11R7.6/rdp/rdp.h
index 9c373068..d1735c70 100644
--- a/xorg/X11R7.6/rdp/rdp.h
+++ b/xorg/X11R7.6/rdp/rdp.h
@@ -76,20 +76,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 //#include "colormapst.h"
 
-/* test to see if this is xorg source or xfree86 */
-#ifdef XORGSERVER
-#  define RDP_IS_XORG
-#else
-#  include <xf86Version.h>
-#  if (XF86_VERSION_MAJOR == 4 && XF86_VERSION_MINOR > 3)
-#    define RDP_IS_XFREE86
-#  elif (XF86_VERSION_MAJOR > 4)
-#    define RDP_IS_XFREE86
-#  else
-#    define RDP_IS_XORG
-#  endif
-#endif
-
 #define X11RDPVER "0.9.1"
 
 #define PixelDPI 100
diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt
index c4e9b986..c1c7de80 100644
--- a/xorg/X11R7.6/x11_file_list.txt
+++ b/xorg/X11R7.6/x11_file_list.txt
@@ -58,8 +58,8 @@ mkfontdir-1.0.6.tar.bz2                         :  mkfontdir-1.0.6
 mkfontscale-1.0.8.tar.bz2                       :  mkfontscale-1.0.8                        :
 xkbcomp-1.2.0.tar.bz2                           :  xkbcomp-1.2.0                            :
 xdriinfo-1.0.4.tar.bz2                          :  xdriinfo-1.0.4                           :
-xorg-server-1.9.3.tar.bz2                       :  xorg-server-1.9.3                        : --with-sha1=libcrypto --disable-dmx --without-dtrace
 applewmproto-1.4.1.tar.bz2                      :  applewmproto-1.4.1                       :
+xorg-server-1.9.3.tar.bz2                       :  xorg-server-1.9.3                        : --with-fontrootdir=$PREFIX_DIR/share/fonts/X11 --with-sha1=libcrypto --disable-dmx --without-dtrace
 bdftopcf-1.0.3.tar.bz2                          :  bdftopcf-1.0.3                           :
 intltool-0.41.1.tar.gz                          :  intltool-0.41.1                          :
 xkeyboard-config-2.0.tar.bz2                    :  xkeyboard-config-2.0                     :
diff --git a/xorg/X11R7.6/xorg-server-1.9.3.patch b/xorg/X11R7.6/xorg-server-1.9.3.patch
new file mode 100644
index 00000000..db6591b9
--- /dev/null
+++ b/xorg/X11R7.6/xorg-server-1.9.3.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -21551,6 +21551,7 @@
+ if test "x$with_sha1" = xlibcrypto; then
+ 	if test "x$HAVE_LIBCRYPTO" = xyes; then
+ 		SHA1_LIBS=-lcrypto
++		SHA1_CFLAGS="$OPENSSL_CFLAGS"
+ 	else
+ 		SHA1_LIBS="$OPENSSL_LIBS"
+ 		SHA1_CFLAGS="$OPENSSL_CFLAGS"