[Intel-gfx] [PATCH] Require xserver 1.3

Fri Apr 17 03:49:23 CEST 2009

On Fri, Apr 17, 2009 at 1:01 AM, Eric Anholt <eric at anholt.net> wrote:
> On Thu, 2009-04-16 at 14:27 +0200, Julien Cristau wrote:
>> I don't think anyone tests this against an old server anymore.
>
> I love this idea, but I think airlied was using something related to
> this code.  airlied, any opinion here?
>

we still use this for building against RHEL5.

Dave.

>> ---
>>  RELEASING                   |    4 ---
>>  configure.ac                |   51 +------------------------------------------
>>  src/Makefile.am             |   24 +-------------------
>>  src/bios_reader/Makefile.am |    2 +-
>>  src/ch7017/Makefile.am      |    2 +-
>>  src/ch7xxx/Makefile.am      |    2 +-
>>  src/ivch/Makefile.am        |    2 +-
>>  src/local_xf86Rename.h      |   23 -------------------
>>  src/sil164/Makefile.am      |    2 +-
>>  src/tfp410/Makefile.am      |    2 +-
>>  10 files changed, 8 insertions(+), 106 deletions(-)
>>  delete mode 100644 src/local_xf86Rename.h
>>
>> diff --git a/RELEASING b/RELEASING
>> index ec67224..9376110 100644
>> --- a/RELEASING
>> +++ b/RELEASING
>> @@ -25,10 +25,6 @@ The process for releasing a new tarball is as follows:
>>
>>       $ make distcheck
>>
>> -     Note that unlike a regular "make", this will not work unless
>> -     you pass a valid --with-xserver-source=/path/to/xserver option
>> -     to configure.
>> -
>>  5. Tag the release
>>
>>       $ git tag -m "Intel <ver> release" <ver>
>> diff --git a/configure.ac b/configure.ac
>> index ad1cfcf..ae5278c 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -70,11 +70,6 @@ AC_ARG_ENABLE(video-debug, AC_HELP_STRING([--enable-video-debug],
>>                [VIDEO_DEBUG="$enableval"],
>>                [VIDEO_DEBUG=no])
>>
>> -AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE],
>> -                                       [Path to X server source tree]),
>> -                        [ XSERVER_SOURCE="$withval" ],
>> -                        [ XSERVER_SOURCE="" ])
>> -
>>  AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
>>                                    [Disable XvMC support [[default=auto]]]),
>>                [XVMC="$enableval"],
>> @@ -88,7 +83,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
>>  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
>>
>>  # Checks for pkg-config packages
>> -PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
>> +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
>>
>>  PKG_CHECK_MODULES(SERVER_1_5, [xorg-server >= 1.5],
>>                             [SERVER_1_5=yes], [SERVER_1_5=no])
>> @@ -129,7 +124,6 @@ if test x$DRI = xauto; then
>>  fi
>>  AC_MSG_RESULT([$DRI])
>>
>> -AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
>>  AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
>>             [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
>>             [#include "xorg-server.h"])
>> @@ -145,49 +139,6 @@ fi
>>  AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
>>  AM_CONDITIONAL(LIBPCIACCESS,
>>       test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes)
>> -AM_CONDITIONAL(XMODES, test "x$XMODES" = xno)
>> -
>> -if test "x$XSERVER_SOURCE" = x; then
>> -     if test -d ../../xserver; then
>> -             XSERVER_SOURCE="`cd ../../xserver && pwd`"
>> -     fi
>> -fi
>> -
>> -if test -d "$XSERVER_SOURCE"; then
>> -     case "$XSERVER_SOURCE" in
>> -     /*)
>> -             ;;
>> -     *)
>> -             XSERVER_SOURCE="`cd $XSERVER_SOURCE && pwd`"
>> -             ;;
>> -     esac
>> -     if test -f $srcdir/src/modes/xf86Modes.h; then
>> -             :
>> -     else
>> -             ln -sf $XSERVER_SOURCE/hw/xfree86/modes $srcdir/src/modes
>> -     fi
>> -
>> -     if test -f $srcdir/src/parser/xf86Parser.h; then
>> -             :
>> -     else
>> -             ln -sf $XSERVER_SOURCE/hw/xfree86/parser $srcdir/src/parser
>> -     fi
>> -fi
>> -
>> -if test "x$XMODES" = xyes; then
>> -     AC_MSG_NOTICE([X server has new mode code])
>> -     AC_DEFINE(XMODES, 1,[X server has built-in mode code])
>> -     XMODES_CFLAGS=
>> -else
>> -     if test -f $srcdir/src/modes/xf86Modes.h -a -f $srcdir/src/parser/xf86Parser.h; then
>> -             AC_MSG_NOTICE([X server is missing new mode code, using local copy])
>> -     else
>> -             AC_MSG_ERROR([Must have X server >= 1.3 source tree for mode setting code. Please specify --with-xserver-source])
>> -     fi
>> -     XMODES_CFLAGS='-DXF86_MODES_RENAME -I$(top_srcdir)/src -I$(top_srcdir)/src/modes -I$(top_srcdir)/src/parser'
>> -fi
>> -
>> -AC_SUBST([XMODES_CFLAGS])
>>
>>  SAVE_CPPFLAGS="$CPPFLAGS"
>>  CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index ad87afc..6ab43fc 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -32,7 +32,7 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER)
>>
>>  AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@ -I$(top_srcdir)/uxa \
>> -     @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA
>> +     -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA
>>
>>  intel_drv_la_LTLIBRARIES = intel_drv.la
>>  intel_drv_la_LDFLAGS = -module -avoid-version
>> @@ -42,23 +42,6 @@ if XSERVER_LIBPCIACCESS
>>  intel_drv_la_LIBADD += @PCIACCESS_LIBS@
>>  endif
>>
>> -XMODE_SRCS=\
>> -      local_xf86Rename.h \
>> -      parser/xf86Parser.h \
>> -      parser/xf86Optrec.h \
>> -      modes/xf86Modes.h \
>> -      modes/xf86Modes.c \
>> -      modes/xf86cvt.c \
>> -      modes/xf86Crtc.h \
>> -      modes/xf86Crtc.c \
>> -      modes/xf86Cursors.c \
>> -      modes/xf86EdidModes.c \
>> -      modes/xf86RandR12.c \
>> -      modes/xf86RandR12.h \
>> -      modes/xf86Rename.h \
>> -      modes/xf86Rotate.c \
>> -      modes/xf86DiDGA.c
>> -
>>  INTEL_DRI_SRCS = \
>>           i810_dri.c \
>>           i810_dri.h \
>> @@ -204,11 +187,6 @@ clean-local:
>>       -rm -f $(INTEL_G4B)
>>  endif
>>
>> -if XMODES
>> -intel_drv_la_SOURCES += \
>> -     $(XMODE_SRCS)
>> -endif
>> -
>>  if DRI
>>  intel_drv_la_SOURCES += \
>>       $(INTEL_DRI_SRCS)
>> diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
>> index 9f1c45a..e060633 100644
>> --- a/src/bios_reader/Makefile.am
>> +++ b/src/bios_reader/Makefile.am
>> @@ -1,4 +1,4 @@
>> -AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @XMODES_CFLAGS@ @PCIACCESS_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @PCIACCESS_CFLAGS@ \
>>       -DREG_DUMPER
>>
>>  noinst_PROGRAMS = bios_reader  $(BIOS_DUMPER) $(SWF_DUMPER)
>> diff --git a/src/ch7017/Makefile.am b/src/ch7017/Makefile.am
>> index fef4d37..48aef60 100644
>> --- a/src/ch7017/Makefile.am
>> +++ b/src/ch7017/Makefile.am
>> @@ -3,7 +3,7 @@
>>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>> -AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@
>>
>>  ch7017_la_LTLIBRARIES = ch7017.la
>> diff --git a/src/ch7xxx/Makefile.am b/src/ch7xxx/Makefile.am
>> index 9f93611..476f84b 100644
>> --- a/src/ch7xxx/Makefile.am
>> +++ b/src/ch7xxx/Makefile.am
>> @@ -3,7 +3,7 @@
>>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>> -AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@
>>
>>  ch7xxx_la_LTLIBRARIES = ch7xxx.la
>> diff --git a/src/ivch/Makefile.am b/src/ivch/Makefile.am
>> index 8b12b09..f9cc116 100644
>> --- a/src/ivch/Makefile.am
>> +++ b/src/ivch/Makefile.am
>> @@ -3,7 +3,7 @@
>>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>> -AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@
>>
>>  ivch_la_LTLIBRARIES = ivch.la
>> diff --git a/src/local_xf86Rename.h b/src/local_xf86Rename.h
>> deleted file mode 100644
>> index e1e788f..0000000
>> --- a/src/local_xf86Rename.h
>> +++ /dev/null
>> @@ -1,23 +0,0 @@
>> -/*
>> - * Copyright © 2006 Keith Packard
>> - *
>> - * Permission to use, copy, modify, distribute, and sell this software and its
>> - * documentation for any purpose is hereby granted without fee, provided that
>> - * the above copyright notice appear in all copies and that both that copyright
>> - * notice and this permission notice appear in supporting documentation, and
>> - * that the name of the copyright holders not be used in advertising or
>> - * publicity pertaining to distribution of the software without specific,
>> - * written prior permission.  The copyright holders make no representations
>> - * about the suitability of this software for any purpose.  It is provided "as
>> - * is" without express or implied warranty.
>> - *
>> - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
>> - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
>> - * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
>> - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
>> - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
>> - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
>> - * OF THIS SOFTWARE.
>> - */
>> -
>> -#define XF86NAME(x) intel_##x
>> diff --git a/src/sil164/Makefile.am b/src/sil164/Makefile.am
>> index 7b179ab..6d1cf37 100644
>> --- a/src/sil164/Makefile.am
>> +++ b/src/sil164/Makefile.am
>> @@ -3,7 +3,7 @@
>>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>> -AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@
>>
>>  sil164_la_LTLIBRARIES = sil164.la
>> diff --git a/src/tfp410/Makefile.am b/src/tfp410/Makefile.am
>> index 0dbc021..23d9c87 100644
>> --- a/src/tfp410/Makefile.am
>> +++ b/src/tfp410/Makefile.am
>> @@ -3,7 +3,7 @@
>>  # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
>>  # _ladir passes a dummy rpath to libtool so the thing will actually link
>>  # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
>> -AM_CFLAGS = @WARN_CFLAGS@ @XMODES_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>> +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
>>       @PCIACCESS_CFLAGS@
>>
>>  tfp410_la_LTLIBRARIES = tfp410.la
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> --
> Eric Anholt
> eric at anholt.net                         eric.anholt at intel.com
>
>
>