summaryrefslogtreecommitdiff
path: root/extra/xf86-video-sisimedia/sync-with-freedesktop.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xf86-video-sisimedia/sync-with-freedesktop.patch')
-rw-r--r--extra/xf86-video-sisimedia/sync-with-freedesktop.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/extra/xf86-video-sisimedia/sync-with-freedesktop.patch b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch
new file mode 100644
index 000000000..eb15814ff
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sync-with-freedesktop.patch
@@ -0,0 +1,63 @@
+diff -daur xf86-video-sis-0.9.1.pristine/configure.ac xf86-video-sis-0.9.1.new/configure.ac
+--- xf86-video-sis-0.9.1.pristine/configure.ac 2012-03-17 14:38:50.324387997 +1100
++++ xf86-video-sis-0.9.1.new/configure.ac 2012-03-17 15:02:13.142748894 +1100
+@@ -21,7 +21,7 @@
+ # Process this file with autoconf to produce a configure script
+
+ # Initialize Autoconf
+-AC_PREREQ(2.60)
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-sis],
+ 0.9.1,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+@@ -31,7 +31,7 @@
+ AC_CONFIG_AUX_DIR(.)
+
+ # Initialize Automake
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+@@ -40,10 +40,9 @@
+ XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ XORG_PROG_RAWCPP
+
+ AH_TOP([#include "xorg-server.h"])
+@@ -76,9 +75,6 @@
+
+ # Checks for libraries.
+
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+ if test "$DRI" != no; then
+ AC_CHECK_FILE([${sdkdir}/dri.h],
+ [have_dri_h="yes"], [have_dri_h="no"])
+@@ -123,8 +119,6 @@
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+-AC_SUBST([DRI_CFLAGS])
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+
+ DRIVER_NAME=sis
+diff -daur xf86-video-sis-0.9.1.pristine/Makefile.am xf86-video-sis-0.9.1.new/Makefile.am
+--- xf86-video-sis-0.9.1.pristine/Makefile.am 2012-03-17 14:38:50.304387685 +1100
++++ xf86-video-sis-0.9.1.new/Makefile.am 2012-03-17 15:01:44.442304963 +1100
+@@ -18,7 +18,6 @@
+ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = src man
+
+ if BUILD_LINUXDOC