summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-08-07 09:25:14 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-08-08 15:04:43 +0200
commit654880c3c878fb2eb79f9553158eecbcd9428f76 (patch)
tree53d2f2536eda92cf10c0f901ed174d792b96274a /patches
parentc822bdc32dae5c3d7ad8d96bfc885c4e4c863c3d (diff)
downloadptxdist-654880c3c878fb2eb79f9553158eecbcd9428f76.tar.gz
ptxdist-654880c3c878fb2eb79f9553158eecbcd9428f76.tar.xz
xorg-server: version bump 1.12.2 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch24
-rw-r--r--patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch24
-rw-r--r--patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch24
l---------patches/xorg-server-1.12.2/autogen.sh1
-rw-r--r--patches/xorg-server-1.12.2/series6
5 files changed, 0 insertions, 79 deletions
diff --git a/patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch b/patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
deleted file mode 100644
index edd606a00..000000000
--- a/patches/xorg-server-1.12.2/0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Juergen Beisert <jbe@pengutronix.de>
-Date: Tue, 12 Jun 2012 16:14:22 +0200
-Subject: [PATCH] Check for LIBUDEV only if udev support is enabled
-
-Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d7c59ed..92fdb70 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -818,8 +818,8 @@ if test "x$CONFIG_UDEV" = xyes &&
- AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
- fi
-
--PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
--if test "x$CONFIG_UDEV" = xauto; then
-+if test "x$CONFIG_UDEV" = xauto -o "x$CONFIG_UDEV" = xyes; then
-+ PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
- CONFIG_UDEV="$HAVE_LIBUDEV"
- fi
- AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
diff --git a/patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch b/patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
deleted file mode 100644
index a330ead6a..000000000
--- a/patches/xorg-server-1.12.2/0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Juergen Beisert <jbe@pengutronix.de>
-Date: Tue, 12 Jun 2012 16:14:22 +0200
-Subject: [PATCH] Check for DBUS only if dbus support is enabled
-
-Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 92fdb70..524afea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -844,8 +844,8 @@ fi
- dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
- dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
- dnl API.
--PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
--if test "x$HAVE_DBUS" = xyes; then
-+if test "x$HAVE_DBUS" = xyes -o "x$HAVE_DBUS" = xauto; then
-+ PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
- AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])
- fi
- AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])
diff --git a/patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch b/patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
deleted file mode 100644
index fd6aafadf..000000000
--- a/patches/xorg-server-1.12.2/0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Juergen Beisert <jbe@pengutronix.de>
-Date: Tue, 12 Jun 2012 16:14:22 +0200
-Subject: [PATCH] Check for HAL only if hal support is enabled
-
-Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 524afea..be21976 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -863,8 +863,8 @@ if test "x$CONFIG_DBUS_API" = xyes; then
- fi
- AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])
-
--PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
--if test "x$CONFIG_HAL" = xauto; then
-+if test "x$CONFIG_HAL" = xauto -o "x$CONFIG_HAL" = xyes; then
-+ PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
- CONFIG_HAL="$HAVE_HAL"
- fi
- if test "x$CONFIG_HAL" = xyes; then
diff --git a/patches/xorg-server-1.12.2/autogen.sh b/patches/xorg-server-1.12.2/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/xorg-server-1.12.2/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh \ No newline at end of file
diff --git a/patches/xorg-server-1.12.2/series b/patches/xorg-server-1.12.2/series
deleted file mode 100644
index cd61a7e6f..000000000
--- a/patches/xorg-server-1.12.2/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Check-for-LIBUDEV-only-if-udev-support-is-enabled.patch
-0002-Check-for-DBUS-only-if-dbus-support-is-enabled.patch
-0003-Check-for-HAL-only-if-hal-support-is-enabled.patch
-# f1d5addf57a6b95a1c69f52b231f1b7a - git-ptx-patches magic