Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (4761525dfe762484bda1ca0ea0c63797f7128ee0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (4761525dfe762484bda1ca0ea0c63797f7128ee0)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4761525dfe762484bda1ca0ea0c63797f7128ee0)
  • Date: Sat, 18 Apr 2009 15:49:01 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

dev/null |binary
xorg-xserver/xorg-server/BUILD | 1
xorg-xserver/xorg-server/DETAILS | 5 --
xorg-xserver/xorg-server/HISTORY | 4 +
xorg-xserver/xorg-server/MesaLib-7.4.tar.bz2.sig | 0
xorg-xserver/xorg-server/PRE_BUILD | 5 --
xorg-xserver/xorg-server/evdev-flush.patch | 42 -------------------
xorg-xserver/xorg-server/gl_select.patch | 49
-----------------------
8 files changed, 5 insertions(+), 101 deletions(-)

New commits:
commit 4761525dfe762484bda1ca0ea0c63797f7128ee0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Remove evdev-flush.patch, missed in 1.6.1 integration

commit 4834954d7ab7e13a2fc15909cfa923bdc56f878f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: MesaLib source is no longer required during build

diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index ec15472..1808f36 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -13,7 +13,6 @@ CFLAGS="${CFLAGS/-O3/-O0}"
CXXFLAGS="${CXXFLAGS/-O3/-O0}"
fi &&
OPTS="${XORG_SERVER_OPTS} \
- --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${VERSION2} \
--with-xkb-output=$TRACK_ROOT/var/lib/xkb \
--with-dri-driver-path=$TRACK_ROOT/usr/lib/dri \
--disable-dmx \
diff --git a/xorg-xserver/xorg-server/DETAILS
b/xorg-xserver/xorg-server/DETAILS
index 84208a0..bacc64e 100755
--- a/xorg-xserver/xorg-server/DETAILS
+++ b/xorg-xserver/xorg-server/DETAILS
@@ -1,14 +1,9 @@
SPELL=xorg-server
VERSION=1.6.1
- VERSION2=7.4
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=MesaLib-$VERSION2.tar.bz2

SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/xserver/$SOURCE
- SOURCE2_URL[0]=$SOURCEFORGE_URL/mesa3d/$SOURCE2

SOURCE_HASH=sha512:debd35fb83683b8442e314997733606bfaf5b78d46120848ed18a8e9948092d023a0a3d2b97b6bbe16ca99bbf39d7ce95f2c8cfb4d833414e3f030550c79039c
- SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-SOURCE2_DIRECTORY="$BUILD_DIRECTORY/Mesa-$VERSION2"
WEB_SITE=http://xorg.freedesktop.org/
ENTERED=20051125
LICENSE[0]=XCL
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index dd97dc6..585a669 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2009-04-18 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, BUILD, PRE_BUILD: MesaLib source is no longer required at
build
+ * gl_select.patch: Removed
+
2009-04-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 1.6.1
* xorg-server-mesa.patch: removed
diff --git a/xorg-xserver/xorg-server/MesaLib-7.4.tar.bz2.sig
b/xorg-xserver/xorg-server/MesaLib-7.4.tar.bz2.sig
deleted file mode 100644
index 8e32c03..0000000
Binary files a/xorg-xserver/xorg-server/MesaLib-7.4.tar.bz2.sig and /dev/null
differ
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 71d22f8..bd52acb 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,6 +1,3 @@
default_pre_build &&
# required to build
-glselect mesa &&
-cd "$SOURCE_DIRECTORY" &&
-unpack_file 2 &&
-patch -p0 < $SPELL_DIRECTORY/gl_select.patch
+glselect mesa
diff --git a/xorg-xserver/xorg-server/evdev-flush.patch
b/xorg-xserver/xorg-server/evdev-flush.patch
deleted file mode 100644
index ccb526b..0000000
--- a/xorg-xserver/xorg-server/evdev-flush.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 710e787..dacc3dc 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -423,6 +423,37 @@ NewInputDeviceRequest (InputOption *options,
DeviceIntPtr *pdev)
- (!is_auto || xf86Info.autoEnableDevices))
- EnableDevice(dev);
-
-+ /* XXX: The VCK always starts with built-in defaults for keymap. These
-+ * defaults are different to the evdev ones. When the first key is hit
on
-+ * an extension device, the keymap is copied into the VCK's and any
-+ * changes made at runtime to the VCK map are lost.
-+ *
-+ * Assumption: if we have at least one evdev keyboard device, we can
-+ * ignore kbd devices. Force a SwitchCoreKeyboard so the VCK has the
same
-+ * keymap as we do.
-+ *
-+ * Next time we hit a key, we don't change the map over anymore (see
-+ * SwitchCoreKeyboard), and live happily ever after.
-+ * Until we have 2 physical keyboards. Or the first real keyboard isn't
-+ * actually the one we use. Oh well.
-+ *
-+ */
-+ if (dev->key)
-+ {
-+ InputInfoPtr info;
-+
-+ /* Search if there is one other keyboard that uses evdev. */
-+ for (info = xf86InputDevs; info; info = info->next)
-+ {
-+ if (info != pInfo && info->dev && info->dev->key &&
-+ (strcmp(info->drv->driverName, "evdev") == 0))
-+ break;
-+ }
-+
-+ if (!info)
-+ SwitchCoreKeyboard(dev);
-+ }
-+
- *pdev = dev;
- return Success;
-
diff --git a/xorg-xserver/xorg-server/gl_select.patch
b/xorg-xserver/xorg-server/gl_select.patch
deleted file mode 100644
index c4f688a..0000000
--- a/xorg-xserver/xorg-server/gl_select.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nuar hw.orig/xfree86/dixmods/Makefile.in hw/xfree86/dixmods/Makefile.in
---- hw.orig/xfree86/dixmods/Makefile.in 2009-04-15 17:22:15.000000000
+0200
-+++ hw/xfree86/dixmods/Makefile.in 2009-04-15 17:24:00.000000000 +0200
-@@ -427,8 +427,7 @@
-
- extsmoduledir = $(moduledir)/extensions
- extsmodule_LTLIBRARIES = $(RECORDMOD) \
-- $(DBEMOD) \
-- $(GLXMODS)
-+ $(DBEMOD)
-
- AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
- INCLUDES = @XORG_INCS@ \
-@@ -500,6 +499,14 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 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 $(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$r'
'$(DESTDIR)$(extsmoduledir)/mesa/$$h'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(extsmoduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$r"
"$(DESTDIR)$(extsmoduledir)/mesa/$$h"; \
-+ else :; fi; \
-+ done
- test -z "$(extsmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(extsmoduledir)"
- @list='$(extsmodule_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
-@@ -834,7 +841,7 @@
- done
- check-am: all-am
- check: check-recursive
--all-am: Makefile $(LTLIBRARIES)
-+all-am: Makefile $(LTLIBRARIES) $(GLXMODS)
- installdirs: installdirs-recursive
- installdirs-am:
- 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 2009-04-15 17:22:15.000000000 +0200
-+++ hw/xfree86/dri/Makefile.in 2009-04-15 17:22:48.000000000 +0200
-@@ -377,7 +377,7 @@
- @GL_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 \


Archive powered by MHonArc 2.6.24.

Top of Page