Changeset 4079

Show
Ignore:
Timestamp:
10/19/07 21:17:52 (1 year ago)
Author:
hverkuil
Message:

Allows building with some older Xorg 7.x releases.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • xf86-video-ivtv/trunk/Makefile.in

    r4069 r4079  
    5353host_triplet = @host@ 
    5454subdir = . 
    55 DIST_COMMON = README ChangeLog $(am__configure_deps) $(srcdir)/Makefile.am \ 
     55DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ 
    5656        $(srcdir)/Makefile.in $(srcdir)/config.h.in \ 
    57         $(top_srcdir)/configure config.guess config.sub depcomp \ 
    58         install-sh ltmain.sh missing 
     57        $(top_srcdir)/configure ChangeLog config.guess config.sub \ 
     58        depcomp install-sh ltmain.sh missing 
    5959ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    6060am__aclocal_m4_deps = $(top_srcdir)/configure.ac 

  • xf86-video-ivtv/trunk/README

    r4073 r4079  
    4141================ 
    4242 
    43 For new 7.x servers run the configure script followed by make and then make install. 
    44 The installation path may well need to be altered using the --prefix option. 
    45  
    46 If you get this error when running the configure script: 
    47  
    48 checking for XORG... configure: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto ) were not met. 
     43For new 7.x servers run the autogen.sh script followed by make and then 
     44make install. The installation path may well need to be altered using the 
     45--prefix option. 
     46 
     47If you get this error when running autogen.sh or the configure script: 
     48 
     49checking for XORG... configure: error: Package requirements (xorg-server xproto fontsproto ) were not met. 
    4950 
    5051then it is likely that you are missing the xorg-server development 

  • xf86-video-ivtv/trunk/config.h.in

    r3805 r4079  
    5151#undef PACKAGE_VERSION 
    5252 
     53/* Major version of this package */ 
     54#undef PACKAGE_VERSION_MAJOR 
     55 
     56/* Minor version of this package */ 
     57#undef PACKAGE_VERSION_MINOR 
     58 
     59/* Patch version of this package */ 
     60#undef PACKAGE_VERSION_PATCHLEVEL 
     61 
    5362/* Define to 1 if you have the ANSI C header files. */ 
    5463#undef STDC_HEADERS 
    …… 
    5665/* Version number of package */ 
    5766#undef VERSION 
     67 
     68/* Update some functions to new X parameter list */ 
     69#undef X_NEW_PARMS 

  • xf86-video-ivtv/trunk/configure

    r4068 r4079  
    2001620016 
    2001720017 
    20018 # Checks for pkg-config packages 
    2001920018 
    2002020019 
    …… 
    2013720136 
    2013820137fi 
     20138if test -n "$PKG_CONFIG" && \ 
     20139    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901\"") >&5 
     20140  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901") 2>&5 
     20141  ac_status=$? 
     20142  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     20143  (exit $ac_status); }; then 
     20144 
     20145cat >>confdefs.h <<\_ACEOF 
     20146#define X_NEW_PARMS 1 
     20147_ACEOF 
     20148 
     20149fi 
     20150 
     20151# Checks for pkg-config packages 
    2013920152 
    2014020153pkg_failed=no 
    …… 
    2014420157if test -n "$PKG_CONFIG"; then 
    2014520158        if test -n "$PKG_CONFIG" && \ 
    20146     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\"") >&5 
    20147   ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5 
     20159    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5 
     20160  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5 
    2014820161  ac_status=$? 
    2014920162  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    2015020163  (exit $ac_status); }; then 
    20151   pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` 
     20164  pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` 
    2015220165else 
    2015320166  pkg_failed=yes 
    …… 
    2015820171if test -n "$PKG_CONFIG"; then 
    2015920172        if test -n "$PKG_CONFIG" && \ 
    20160     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\"") >&5 
    20161   ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5 
     20173    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5 
     20174  ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5 
    2016220175  ac_status=$? 
    2016320176  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    2016420177  (exit $ac_status); }; then 
    20165   pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` 
     20178  pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null` 
    2016620179else 
    2016720180  pkg_failed=yes 
    …… 
    2017220185 
    2017320186if test $pkg_failed = yes; then 
    20174         XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES"` 
     20187        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"` 
    2017520188        # Put the nasty error message in config.log where it belongs 
    2017620189        echo "$XORG_PKG_ERRORS" 1>&5 
    2017720190 
    20178         { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met. 
     20191        { { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. 
    2017920192Consider adjusting the PKG_CONFIG_PATH environment variable if you 
    2018020193installed software in a non-standard prefix. 
    …… 
    2018320196to avoid the need to call pkg-config.  See the pkg-config man page for 
    2018420197more details." >&5 
    20185 echo "$as_me: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met. 
     20198echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met. 
    2018620199Consider adjusting the PKG_CONFIG_PATH environment variable if you 
    2018720200installed software in a non-standard prefix. 

  • xf86-video-ivtv/trunk/configure.ac

    r4068 r4079  
    4848            [moduledir="$libdir/xorg/modules"]) 
    4949 
     50PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901], 
     51                  [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])]) 
     52 
    5053# Checks for pkg-config packages 
    51 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) 
     54PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) 
    5255sdkdir=$(pkg-config --variable=sdkdir xorg-server) 
    5356 

  • xf86-video-ivtv/trunk/src/ivtv.c

    r4067 r4079  
    199199IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) 
    200200{ 
    201 #ifdef X_MODULAR 
     201#ifdef X_NEW_PARMS 
    202202    RegionPtr damage = DamageRegion(pBuf->pDamage); 
    203203#else 

  • xf86-video-ivtv/trunk/src/ivtv_hw.h

    r4049 r4079  
    9191#endif 
    9292 
    93 /* FIXME - There must be a better way to do this..... */ 
    94 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0) 
    95 # define X_MODULAR 1 
    96 #elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0) 
    97 # define X_MODULAR 1 
    98 #endif 
    99  
    10093Bool ivtvHWGetRec(ScrnInfoPtr pScrn); 
    10194void ivtvHWFreeRec(ScrnInfoPtr pScrn); 

  • xf86-video-ivtv/trunk/src/ivtv_xv.c

    r4049 r4079  
    6767    unsigned int *, unsigned int *, pointer); 
    6868 
    69 #ifdef X_MODULAR 
     69#ifdef X_NEW_PARMS 
    7070static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short, 
    7171    short, short, short, int, unsigned char *, short, 
    …… 
    677677} 
    678678 
    679 #ifdef X_MODULAR 
     679#ifdef X_NEW_PARMS 
    680680static int 
    681681IVTVPutImage(ScrnInfoPtr pScrn,