summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xxorg-xserver/xorg-server/DETAILS4
-rwxr-xr-xxorg-xserver/xorg-server/PRE_BUILD2
-rw-r--r--xorg-xserver/xorg-server/gl_select.patch65
3 files changed, 36 insertions, 35 deletions
diff --git a/xorg-xserver/xorg-server/DETAILS b/xorg-xserver/xorg-server/DETAILS
index 887be8311d..039f150bd1 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,6 +1,6 @@
SPELL=xorg-server
- VERSION=1.12.4
- SOURCE_HASH=sha512:70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85
+ VERSION=1.13.1
+ SOURCE_HASH=sha512:8732be86efdf430bfefe3fea02892042da214d0eb018f12496329b20d7282697d4d92cfb59e35ecabe6a6ca9b034cb12c02e67f44ab4538917c470064719fa45
SOURCE=$SPELL-$VERSION.tar.bz2
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD
index 7ce2187e34..710034f1f2 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -2,4 +2,4 @@ default_pre_build &&
# required to build
glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
-patch -p0 < $SPELL_DIRECTORY/gl_select.patch
+patch -p1 < $SPELL_DIRECTORY/gl_select.patch
diff --git a/xorg-xserver/xorg-server/gl_select.patch b/xorg-xserver/xorg-server/gl_select.patch
index c52f57514b..aea0a57143 100644
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ b/xorg-xserver/xorg-server/gl_select.patch
@@ -1,49 +1,50 @@
-diff -Nuar hw.orig/xfree86/dixmods/Makefile.in hw/xfree86/dixmods/Makefile.in
---- hw.orig/xfree86/dixmods/Makefile.in 2012-08-27 07:12:00.000000000 +0200
-+++ hw/xfree86/dixmods/Makefile.in 2012-08-27 13:36:52.000000000 +0200
-@@ -579,8 +579,7 @@
+From e0d5c3f180a492ef474c048326d86aa1a0dbd68f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+Date: Sat, 22 Dec 2012 11:54:34 +0100
+Subject: [PATCH] gl_select
+
+---
+ hw/xfree86/dixmods/Makefile.in | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/dixmods/Makefile.in b/hw/xfree86/dixmods/Makefile.in
+index 5932253..f53ac8b 100644
+--- a/hw/xfree86/dixmods/Makefile.in
++++ b/hw/xfree86/dixmods/Makefile.in
+@@ -516,7 +516,7 @@ module_LTLIBRARIES = libfb.la \
+ libshadow.la
extsmoduledir = $(moduledir)/extensions
- extsmodule_LTLIBRARIES = $(RECORDMOD) \
-- $(DBEMOD) \
-- $(GLXMODS)
-+ $(DBEMOD)
-
+-extsmodule_LTLIBRARIES = $(GLXMODS)
++extsmodule_LTLIBRARIES =
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \
-@@ -652,6 +651,14 @@
+ -I$(top_srcdir)/hw/xfree86/loader \
+@@ -578,6 +578,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ $(mkdir_p) "$(DESTDIR)$(extsmoduledir)/.mesa"
+ @lst='$(GLXMODS)'; for r in $$lst; do \
-+ if test -f $$r; then \
-+ h=$(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r' '$(DESTDIR)$(extsmoduledir)/.mesa/'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/.mesa/"; \
-+ else :; fi; \
-+ done
++ if test -f $$r; then \
++ h=$(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) '$$r' '$(DESTDIR)$(extsmoduledir)/.mesa/'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$r "$(DESTDIR)$(extsmoduledir)/.mesa/"; \
++ else :; fi; \
++ done
++
@list='$(extsmodule_LTLIBRARIES)'; test -n "$(extsmoduledir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
-@@ -1010,7 +1017,7 @@
+@@ -825,7 +834,7 @@ distdir: $(DISTFILES)
done
check-am: all-am
- check: check-recursive
+ check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(GLXMODS)
- installdirs: installdirs-recursive
- installdirs-am:
+ installdirs:
for dir in "$(DESTDIR)$(extsmoduledir)" "$(DESTDIR)$(moduledir)"; do \
-diff -Nuar hw.orig/xfree86/dri/Makefile.in hw/xfree86/dri/Makefile.in
---- hw.orig/xfree86/dri/Makefile.in 2012-08-27 07:12:00.000000000 +0200
-+++ hw/xfree86/dri/Makefile.in 2012-08-27 13:21:05.000000000 +0200
-@@ -498,7 +498,7 @@
- @DRI_CFLAGS@
-
- libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
--libdri_ladir = $(moduledir)/extensions
-+libdri_ladir = $(moduledir)/extensions/.mesa
- libdri_la_SOURCES = \
- dri.c \
- dri.h \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+--
+1.8.0
+