Hello community, here is the log from the commit of package xorg-x11-driver-video checked in at Tue Dec 19 17:22:01 CET 2006. -------- --- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-09 11:03:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-12-17 12:01:44.000000000 +0100 @@ -1,0 +2,14 @@ +Sun Dec 17 11:59:46 CET 2006 - sndirsch@suse.de + +- updated mga driver to release 1.4.6 + * Makefile.am: fix ChangeLog hook + * Use the XORG_RELEASE_VERSION autoconf macro. + * More janitoring work. + * Removed a duplicated register definition. +- updated nv driver to release 1.2.2 + * Remove redundant XORG_RELEASE_VERSION + * Makefile.am: make ChangeLog hook safer +- updated rendition driver to release 4.1.3 + * Makefile.am: make ChangeLog hook safer + +------------------------------------------------------------------- Old: ---- xf86-video-mga-1.4.5.tar.bz2 xf86-video-nv-1.2.1.tar.bz2 xf86-video-rendition-4.1.2.tar.bz2 New: ---- xf86-video-mga-1.4.6.tar.bz2 xf86-video-nv-1.2.2.tar.bz2 xf86-video-rendition-4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.eM7bZN/_old 2006-12-19 17:21:18.000000000 +0100 +++ /var/tmp/diff_new_pack.eM7bZN/_new 2006-12-19 17:21:18.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 34 +Release: 40 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -35,12 +35,12 @@ Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2 Source12: xf86-video-i810-1.7.3.tar.bz2 Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2 -Source14: xf86-video-mga-1.4.5.tar.bz2 +Source14: xf86-video-mga-1.4.6.tar.bz2 Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 Source16: xf86-video-newport-0.2.1.tar.bz2 Source17: xf86-video-nsc-2.8.2.tar.bz2 -Source18: xf86-video-nv-1.2.1.tar.bz2 -Source19: xf86-video-rendition-4.1.2.tar.bz2 +Source18: xf86-video-nv-1.2.2.tar.bz2 +Source19: xf86-video-rendition-4.1.3.tar.bz2 Source20: xf86-video-s3-0.5.0.tar.bz2 Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 Source22: xf86-video-savage-2.1.2.tar.bz2 @@ -206,6 +206,17 @@ %{_mandir}/man4/* %changelog -n xorg-x11-driver-video +* Sun Dec 17 2006 - sndirsch@suse.de +- updated mga driver to release 1.4.6 + * Makefile.am: fix ChangeLog hook + * Use the XORG_RELEASE_VERSION autoconf macro. + * More janitoring work. + * Removed a duplicated register definition. +- updated nv driver to release 1.2.2 + * Remove redundant XORG_RELEASE_VERSION + * Makefile.am: make ChangeLog hook safer +- updated rendition driver to release 4.1.3 + * Makefile.am: make ChangeLog hook safer * Sat Dec 09 2006 - sndirsch@suse.de - added optional "i810sdvo" driver for SDVO support ("modesetting-sdvo-stuffing" branch) ++++++ xf86-video-mga-1.4.5.tar.bz2 -> xf86-video-mga-1.4.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/ChangeLog new/xf86-video-mga-1.4.6/ChangeLog --- old/xf86-video-mga-1.4.5/ChangeLog 2006-11-30 19:00:05.000000000 +0100 +++ new/xf86-video-mga-1.4.6/ChangeLog 2006-12-16 00:46:00.000000000 +0100 @@ -1,3 +1,40 @@ +commit ede471a547a24e7f9688917fc3329a3d67fb2dc4 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Dec 16 01:44:49 2006 +0200 + + bump to 1.4.6 + +commit 55d283a8c2347e809dadace3fb9a026bab6d57dd +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Dec 6 18:46:00 2006 +0200 + + Makefile.am: fix ChangeLog hook + Make ChangeLog hook safe for all situations I could think of, including + carrying the ChangeLog through for distcheck when objdir != srcdir. It's + significantly more ugly, but eh. + +commit fbbbb853041ae4af36eeffb24188b9a5513ba7d5 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Sat Dec 2 12:42:34 2006 +0100 + + Removed a duplicated register definition. + +commit 447aae84d07cab34987ab08ead9319e176ccd904 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Fri Dec 1 20:19:13 2006 +0100 + + More janitoring work. + + Moved the XPWRCTRL, XDISPCTRL and C2CTL register definitions + to mga_reg.h. + Cleaned up the DAC2 routing. + +commit 10b2202c254b71b8d0da987a225d5e78a030bca4 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Fri Dec 1 19:10:55 2006 +0100 + + Use the XORG_RELEASE_VERSION autoconf macro. + commit 00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 30 19:59:38 2006 +0200 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/Makefile.am new/xf86-video-mga-1.4.6/Makefile.am --- old/xf86-video-mga-1.4.5/Makefile.am 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/Makefile.am 2006-12-06 17:43:10.000000000 +0100 @@ -27,6 +27,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/Makefile.in new/xf86-video-mga-1.4.6/Makefile.in --- old/xf86-video-mga-1.4.5/Makefile.in 2006-11-30 18:59:57.000000000 +0100 +++ new/xf86-video-mga-1.4.6/Makefile.in 2006-12-16 00:45:48.000000000 +0100 @@ -711,7 +711,7 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/aclocal.m4 new/xf86-video-mga-1.4.6/aclocal.m4 --- old/xf86-video-mga-1.4.5/aclocal.m4 2006-11-30 18:59:48.000000000 +0100 +++ new/xf86-video-mga-1.4.6/aclocal.m4 2006-12-16 00:45:33.000000000 +0100 @@ -6584,7 +6584,7 @@ XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.1 + [XORG_MACROS_version=1.1.3 XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then @@ -7037,7 +7037,8 @@ # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -7050,6 +7051,23 @@ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\).*/\1/p'`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\).*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\)\.\([[^\.]]\+\).*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. @@ -7776,10 +7794,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' + _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/config.h.in new/xf86-video-mga-1.4.6/config.h.in --- old/xf86-video-mga-1.4.5/config.h.in 2006-11-30 18:59:53.000000000 +0100 +++ new/xf86-video-mga-1.4.6/config.h.in 2006-12-16 00:46:00.000000000 +0100 @@ -50,6 +50,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/configure new/xf86-video-mga-1.4.6/configure --- old/xf86-video-mga-1.4.5/configure 2006-11-30 18:59:53.000000000 +0100 +++ new/xf86-video-mga-1.4.6/configure 2006-12-16 00:45:43.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xf86-video-mga 1.4.5. +# Generated by GNU Autoconf 2.60 for xf86-video-mga 1.4.6. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xf86-video-mga' PACKAGE_TARNAME='xf86-video-mga' -PACKAGE_VERSION='1.4.5' -PACKAGE_STRING='xf86-video-mga 1.4.5' +PACKAGE_VERSION='1.4.6' +PACKAGE_STRING='xf86-video-mga 1.4.6' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1411,7 +1411,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-mga 1.4.5 to adapt to many kinds of systems. +\`configure' configures xf86-video-mga 1.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1481,7 +1481,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-mga 1.4.5:";; + short | recursive ) echo "Configuration of xf86-video-mga 1.4.6:";; esac cat <<\_ACEOF @@ -1505,6 +1505,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-release-version=STRING + Use release version string in package name --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] @@ -1512,8 +1514,6 @@ --with-xorg-module-dir=DIR Default xorg module directory [default=$libdir/xorg/modules] - --with-release-version=STRING - Use release version string in package name Some influential environment variables: CC C compiler command @@ -1598,7 +1598,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xf86-video-mga configure 1.4.5 +xf86-video-mga configure 1.4.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1612,7 +1612,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-mga $as_me 1.4.5, which was +It was created by xf86-video-mga $as_me 1.4.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -1967,6 +1967,46 @@ + +# Check whether --with-release-version was given. +if test "${with_release_version+set}" = set; then + withval=$with_release_version; RELEASE_VERSION="$withval" +else + RELEASE_VERSION="" +fi + + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + { echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5 +echo "$as_me: Building with package name set to $PACKAGE" >&6;} + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + + + ac_config_headers="$ac_config_headers config.h" ac_aux_dir= @@ -2276,10 +2316,10 @@ AMDEPSHOWCMDSAT='' AMPRETTYECHO=true AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; +if test "x$enable_pretty_cmds" = xyes; then AMSHOWCMDSAT='@' - test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' + test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@' AMPRETTYECHO=echo AMCMDECHO=true LT_QUIET='--quiet' @@ -2310,7 +2350,7 @@ # Define the identity of the package. PACKAGE='xf86-video-mga' - VERSION='1.4.5' + VERSION='1.4.6' cat >>confdefs.h <<_ACEOF @@ -4455,7 +4495,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4458 "configure"' > conftest.$ac_ext + echo '#line 4498 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7419,11 +7459,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7422: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7462: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7426: \$? = $ac_status" >&5 + echo "$as_me:7466: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7687,11 +7727,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7690: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7730: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7694: \$? = $ac_status" >&5 + echo "$as_me:7734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7791,11 +7831,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7794: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7834: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7798: \$? = $ac_status" >&5 + echo "$as_me:7838: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10232,7 +10272,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10235 "configure" +#line 10275 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10332,7 +10372,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10335 "configure" +#line 10375 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12700,11 +12740,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12703: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12743: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12707: \$? = $ac_status" >&5 + echo "$as_me:12747: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12804,11 +12844,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12807: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12847: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12811: \$? = $ac_status" >&5 + echo "$as_me:12851: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14365,11 +14405,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14368: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14372: \$? = $ac_status" >&5 + echo "$as_me:14412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14469,11 +14509,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14472: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14512: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14476: \$? = $ac_status" >&5 + echo "$as_me:14516: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16688,11 +16728,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16691: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16731: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16695: \$? = $ac_status" >&5 + echo "$as_me:16735: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16956,11 +16996,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16959: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16999: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16963: \$? = $ac_status" >&5 + echo "$as_me:17003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17060,11 +17100,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17063: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17103: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17067: \$? = $ac_status" >&5 + echo "$as_me:17107: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21965,6 +22005,29 @@ echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile util/Makefile" @@ -22407,7 +22470,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xf86-video-mga $as_me 1.4.5, which was +This file was extended by xf86-video-mga $as_me 1.4.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22460,7 +22523,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-mga config.status 1.4.5 +xf86-video-mga config.status 1.4.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/configure.ac new/xf86-video-mga-1.4.6/configure.ac --- old/xf86-video-mga-1.4.5/configure.ac 2006-11-30 18:59:28.000000000 +0100 +++ new/xf86-video-mga-1.4.6/configure.ac 2006-12-16 00:44:09.000000000 +0100 @@ -24,10 +24,12 @@ # When the version number is modified here, also modify it in src/mga.h. AC_INIT([xf86-video-mga], - 1.4.5, + 1.4.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) +XORG_RELEASE_VERSION + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga.h new/xf86-video-mga-1.4.6/src/mga.h --- old/xf86-video-mga-1.4.5/src/mga.h 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga.h 2006-12-06 17:29:59.000000000 +0100 @@ -154,9 +154,6 @@ #define MGA_C_NAME MGA #define MGA_MODULE_DATA mgaModuleData #define MGA_DRIVER_NAME "mga" -#define MGA_MAJOR_VERSION 1 -#define MGA_MINOR_VERSION 4 -#define MGA_PATCHLEVEL 4 typedef struct { unsigned char ExtVga[6]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_dh.c new/xf86-video-mga-1.4.6/src/mga_dh.c --- old/xf86-video-mga-1.4.5/src/mga_dh.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_dh.c 2006-12-06 17:29:59.000000000 +0100 @@ -26,36 +26,6 @@ #define CLKSEL_MGA 0x0c #define PLLLOCK 0x40 -/* CRTC2 control field*/ -#define C2_EN_A 0 -#define C2_EN_M (1 << C2_EN_A) -#define C2_HIPRILVL_A 4 -#define C2_HIPRILVL_M (7 << C2_HIPRILVL_A) -#define C2_MAXHIPRI_A 8 -#define C2_MAXHIPRI_M (7 << C2_MAXHIPRI_A) - -#define C2CTL_PIXCLKSEL_SHIFT 1L -#define C2CTL_PIXCLKSEL_MASK (3L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSELH_SHIFT 14L -#define C2CTL_PIXCLKSELH_MASK (1L << C2CTL_PIXCLKSELH_SHIFT) -#define C2CTL_PIXCLKSEL_PCICLK 0L -#define C2CTL_PIXCLKSEL_VDOCLK (1L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_PIXELPLL (2L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_VIDEOPLL (3L << C2CTL_PIXCLKSEL_SHIFT) -#define C2CTL_PIXCLKSEL_VDCLK (1L << C2CTL_PIXCLKSELH_SHIFT) - -#define C2CTL_PIXCLKSEL_CRISTAL (1L << C2CTL_PIXCLKSEL_SHIFT) | (1L << C2CTL_PIXCLKSELH_SHIFT) -#define C2CTL_PIXCLKSEL_SYSTEMPLL (2L << C2CTL_PIXCLKSEL_SHIFT) | (1L << C2CTL_PIXCLKSELH_SHIFT) - -#define C2CTL_PIXCLKDIS_SHIFT 3L -#define C2CTL_PIXCLKDIS_MASK (1L << C2CTL_PIXCLKDIS_SHIFT) -#define C2CTL_PIXCLKDIS_DISABLE (1L << C2CTL_PIXCLKDIS_SHIFT) - -#define C2CTL_CRTCDACSEL_SHIFT 20L -#define C2CTL_CRTCDACSEL_MASK (1L << C2CTL_CRTCDACSEL_SHIFT) -#define C2CTL_CRTCDACSEL_CRTC1 0 -#define C2CTL_CRTCDACSEL_CRTC2 (1L << C2CTL_CRTCDACSEL_SHIFT) - /* Misc field*/ #define IOADDSEL 0x01 #define RAMMAPEN 0x02 @@ -101,39 +71,6 @@ #define XSYNCCTRL_DAC2VSOFF_OFF (1 << XSYNCCTRL_DAC2VSOFF_SHIFT) #define XSYNCCTRL_DAC2VSOFF_ON 0 - -/* XDISPCTRL field */ -#define XDISPCTRL_DAC1OUTSEL_SHIFT 0L -#define XDISPCTRL_DAC1OUTSEL_MASK 1L -#define XDISPCTRL_DAC1OUTSEL_DIS 0L -#define XDISPCTRL_DAC1OUTSEL_EN 1L -#define XDISPCTRL_DAC2OUTSEL_SHIFT 2L -#define XDISPCTRL_DAC2OUTSEL_MASK (3L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_DIS 0L -#define XDISPCTRL_DAC2OUTSEL_CRTC1 (1L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_CRTC2 (2L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_DAC2OUTSEL_TVE (3L << XDISPCTRL_DAC2OUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_SHIFT 5L -#define XDISPCTRL_PANOUTSEL_MASK (3L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_DIS 0L -#define XDISPCTRL_PANOUTSEL_CRTC1 (1L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_CRTC2RGB (2L << XDISPCTRL_PANOUTSEL_SHIFT) -#define XDISPCTRL_PANOUTSEL_CRTC2656 (3L << XDISPCTRL_PANOUTSEL_SHIFT) - -/* XPWRCTRL field*/ -#define XPWRCTRL_DAC2PDN_SHIFT 0 -#define XPWRCTRL_DAC2PDN_MASK (1 << XPWRCTRL_DAC2PDN_SHIFT) -#define XPWRCTRL_VIDPLLPDN_SHIFT 1 -#define XPWRCTRL_VIDPLLPDN_MASK (1 << XPWRCTRL_VIDPLLPDN_SHIFT) -#define XPWRCTRL_PANPDN_SHIFT 2 -#define XPWRCTRL_PANPDN_MASK (1 << XPWRCTRL_PANPDN_SHIFT) -#define XPWRCTRL_RFIFOPDN_SHIFT 3 -#define XPWRCTRL_RFIFOPDN_MASK (1 << XPWRCTRL_RFIFOPDN_SHIFT) -#define XPWRCTRL_CFIFOPDN_SHIFT 4 -#define XPWRCTRL_CFIFOPDN_MASK (1 << XPWRCTRL_CFIFOPDN_SHIFT) - - - #define POS_HSYNC 0x00000004 #define POS_VSYNC 0x00000008 @@ -295,20 +232,23 @@ ulC2CTL = INREG( MGAREG_C2CTL); /*--- Disable Pixel clock oscillations On Crtc1 */ - OUTREG( MGAREG_C2CTL, ulC2CTL | C2CTL_PIXCLKDIS_MASK); + OUTREG( MGAREG_C2CTL, ulC2CTL | MGAREG_C2CTL_PIXCLKDIS_MASK); /*--- Have to wait minimum time (2 acces will be ok) */ (void) INREG( MGAREG_Status); (void) INREG( MGAREG_Status); - ulC2CTL &= ~(C2CTL_PIXCLKSEL_MASK | C2CTL_PIXCLKSELH_MASK); + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKSEL_MASK; + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKSELH_MASK; - ulC2CTL |= C2CTL_PIXCLKSEL_VIDEOPLL; + ulC2CTL |= MGAREG_C2CTL_PIXCLKSEL_VIDEOPLL; OUTREG( MGAREG_C2CTL, ulC2CTL); + /*--- Enable Pixel clock oscillations on CRTC2*/ - OUTREG( MGAREG_C2CTL, ulC2CTL & ~C2CTL_PIXCLKDIS_MASK); + ulC2CTL &= ~MGAREG_C2CTL_PIXCLKDIS_MASK; + OUTREG( MGAREG_C2CTL, ulC2CTL); /* We don't use MISC synch pol, must be 0*/ @@ -336,24 +276,21 @@ ulC2CTL = INREG(MGAREG_C2CTL); ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC2; + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; if (!pMga->SecondOutput) { /* Route Crtc2 on Output1 */ - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC1; - ulC2CTL |= C2CTL_CRTCDACSEL_CRTC2; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; + ulC2CTL |= MGAREG_C2CTL_CRTCDACSEL_CRTC2; } else { /* Route Crtc2 on Output2*/ - ucXDispCtrl &= ~XDISPCTRL_DAC2OUTSEL_MASK; - ucXDispCtrl |= XDISPCTRL_DAC2OUTSEL_CRTC2; - ulC2CTL &= ~C2CTL_CRTCDACSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC2; + ulC2CTL &= ~MGAREG_C2CTL_CRTCDACSEL_MASK; } /* Enable CRTC2*/ - ulC2CTL |= C2_EN_M; + ulC2CTL |= MGAREG_C2CTL_C2_EN; pReg->dac2[ MGA1064_DISP_CTL - 0x80] = ucXDispCtrl; @@ -377,15 +314,14 @@ ucByte &= ~(XSYNCCTRL_DAC2HSOFF_MASK | XSYNCCTRL_DAC2VSOFF_MASK); pReg->dac2[ MGA1064_SYNC_CTL - 0x80] = ucByte; - /* Powerup DAC2*/ - ucByte = inMGAdac( MGA1064_PWR_CTL); - pReg->dac2[ MGA1064_PWR_CTL - 0x80] = /* 0x0b; */ (ucByte | XPWRCTRL_DAC2PDN_MASK); - - - - /* Power up Fifo*/ - ucByte = inMGAdac( MGA1064_PWR_CTL); - pReg->dac2[ MGA1064_PWR_CTL - 0x80] = 0x1b; /* (ucByte | XPWRCTRL_CFIFOPDN_MASK) */; + /* Power up DAC2, Fifo. + * The TMDS is powered down here, which is likely wrong. + */ + pReg->dac2[MGA1064_PWR_CTL - 0x80] = + MGA1064_PWR_CTL_DAC2_EN | + MGA1064_PWR_CTL_VID_PLL_EN | + MGA1064_PWR_CTL_RFIFO_EN | + MGA1064_PWR_CTL_CFIFO_EN; #ifdef DEBUG diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_dri.c new/xf86-video-mga-1.4.6/src/mga_dri.c --- old/xf86-video-mga-1.4.5/src/mga_dri.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_dri.c 2006-12-06 17:29:59.000000000 +0100 @@ -987,9 +987,9 @@ ((pciConfigPtr)pMga->PciInfo->thisCard)->devnum, ((pciConfigPtr)pMga->PciInfo->thisCard)->funcnum ); } - pDRIInfo->ddxDriverMajorVersion = MGA_MAJOR_VERSION; - pDRIInfo->ddxDriverMinorVersion = MGA_MINOR_VERSION; - pDRIInfo->ddxDriverPatchVersion = MGA_PATCHLEVEL; + pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; + pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; + pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; pDRIInfo->frameBufferPhysicalAddress = (void *) pMga->FbAddress; pDRIInfo->frameBufferSize = pMga->FbMapSize; pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_driver.c new/xf86-video-mga-1.4.6/src/mga_driver.c --- old/xf86-video-mga-1.4.5/src/mga_driver.c 2006-11-08 18:16:44.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_driver.c 2006-12-06 17:29:59.000000000 +0100 @@ -440,7 +440,7 @@ MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - MGA_MAJOR_VERSION, MGA_MINOR_VERSION, MGA_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, @@ -2945,8 +2945,8 @@ */ CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); - ucXDispCtrl &= ~0x0c; /* dac2outsel mask */ - ucXDispCtrl |= 0x04; /* dac2 -> crtc1 */ + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; outMGAdac(MGA1064_DISP_CTL, ucXDispCtrl); @@ -2954,9 +2954,13 @@ CARD8 ucXDispCtrl = inMGAdac(MGA1064_DISP_CTL); CARD32 ulC2CTL = INREG(MGAREG_C2CTL); - ucXDispCtrl &= ~0x0c; /* dac2outsel mask */ - ucXDispCtrl |= 0x5; /* dac1outsel -> crtcdacsel, dac2 -> crtc1 */ - ulC2CTL &= ~0x00100000; /* crtcdacsel -> crtc1 */ + ucXDispCtrl &= ~MGA1064_DISP_CTL_DAC2OUTSEL_MASK; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC1OUTSEL_EN; + ucXDispCtrl |= MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1; + + /* crtcdacsel -> crtc1 */ + ulC2CTL &= ~MGAREG_C2CTL_CRTCDACSEL_CRTC2; + ulC2CTL |= MGAREG_C2CTL_CRTCDACSEL_CRTC1; outMGAdac(MGA1064_DISP_CTL, ucXDispCtrl); OUTREG(MGAREG_C2CTL, ulC2CTL); @@ -2966,12 +2970,10 @@ /* Force to close second crtc */ CARD32 ulC2CTL = INREG(MGAREG_C2CTL); - ulC2CTL &= ~0x1; /* crtc2 disabled */ + ulC2CTL &= ~MGAREG_C2CTL_C2_EN; OUTREG(MGAREG_C2CTL, ulC2CTL); } - - return; } /* @@ -3692,8 +3694,6 @@ } -#define C2STARTADD0 0x3C28 - void MGAAdjustFrameCrtc2(int scrnIndex, int x, int y, int flags) { @@ -3723,7 +3723,7 @@ Base = (y * pLayout->displayWidth + x) * pLayout->bitsPerPixel >> 3; Base += pMga->DstOrg; Base &= 0x01ffffc0; - OUTREG(C2STARTADD0, Base); + OUTREG(MGAREG_C2STARTADD0, Base); ); } @@ -4079,8 +4079,8 @@ if (PowerManagementMode==DPMSModeOn) { /* Enable CRTC2 */ - val |= 0x1; - val &= ~(0x8); + val |= MGAREG_C2CTL_C2_EN; + val &= ~MGAREG_C2CTL_PIXCLKDIS_DISABLE; OUTREG(MGAREG_C2CTL, val); /* Restore normal MAVEN values */ if (pMga->Maven) { @@ -4108,8 +4108,8 @@ } else { /* Disable CRTC2 video */ - val |= 0x8; - val &= ~(0x1); + val |= MGAREG_C2CTL_PIXCLKDIS_DISABLE; + val &= ~MGAREG_C2CTL_C2_EN; OUTREG(MGAREG_C2CTL, val); /* Disable MAVEN display */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_merge.c new/xf86-video-mga-1.4.6/src/mga_merge.c --- old/xf86-video-mga-1.4.5/src/mga_merge.c 2006-11-30 18:59:07.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_merge.c 2006-12-06 17:29:59.000000000 +0100 @@ -955,7 +955,7 @@ /* power on Dac2 */ reg = inMGAdac(MGA1064_PWR_CTL); - reg |= 1; + reg |= MGA1064_PWR_CTL_DAC2_EN; outMGAdac(MGA1064_PWR_CTL, reg); } else { /* power off Dac1 */ @@ -965,7 +965,7 @@ /* power off Dac2 */ reg = inMGAdac(MGA1064_PWR_CTL); - reg &= ~1; + reg &= ~MGA1064_PWR_CTL_DAC2_EN; outMGAdac(MGA1064_PWR_CTL, reg); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-mga-1.4.5/src/mga_reg.h new/xf86-video-mga-1.4.6/src/mga_reg.h --- old/xf86-video-mga-1.4.5/src/mga_reg.h 2006-11-30 18:59:07.000000000 +0100 +++ new/xf86-video-mga-1.4.6/src/mga_reg.h 2006-12-06 17:29:59.000000000 +0100 @@ -408,8 +408,29 @@ #define MGA1064_VID_PLL_N 0x8F #define MGA1064_DISP_CTL 0x8a +#define MGA1064_DISP_CTL_DAC1OUTSEL_MASK 0x01 +#define MGA1064_DISP_CTL_DAC1OUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_DAC1OUTSEL_EN 0x01 +#define MGA1064_DISP_CTL_DAC2OUTSEL_MASK (0x03 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_DAC2OUTSEL_CRTC1 (0x01 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_CRTC2 (0x02 << 2) +#define MGA1064_DISP_CTL_DAC2OUTSEL_TVE (0x03 << 2) +#define MGA1064_DISP_CTL_PANOUTSEL_MASK (0x03 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_DIS 0x00 +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC1 (0x01 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC2RGB (0x02 << 5) +#define MGA1064_DISP_CTL_PANOUTSEL_CRTC2656 (0x03 << 5) + #define MGA1064_SYNC_CTL 0x8b + #define MGA1064_PWR_CTL 0xa0 +#define MGA1064_PWR_CTL_DAC2_EN (0x01 << 0) +#define MGA1064_PWR_CTL_VID_PLL_EN (0x01 << 1) +#define MGA1064_PWR_CTL_PANEL_EN (0x01 << 2) +#define MGA1064_PWR_CTL_RFIFO_EN (0x01 << 3) +#define MGA1064_PWR_CTL_CFIFO_EN (0x01 << 4) + #define MGA1064_PAN_CTL 0xa2 /* Using crtc2 */ @@ -424,6 +445,29 @@ #define MGAREG2_C2DATACTL 0x4c #define MGAREG_C2CTL 0x3c10 +#define MGAREG_C2CTL_C2_EN 0x01 + +#define MGAREG_C2_HIPRILVL_M (0x07 << 4) +#define MGAREG_C2_MAXHIPRI_M (0x07 << 8) + +#define MGAREG_C2CTL_PIXCLKSEL_MASK (0x03 << 1) +#define MGAREG_C2CTL_PIXCLKSELH_MASK (0x01 << 14) +#define MGAREG_C2CTL_PIXCLKSEL_PCICLK 0x00 +#define MGAREG_C2CTL_PIXCLKSEL_VDOCLK (0x01 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_PIXELPLL (0x02 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_VIDEOPLL (0x03 << 1) +#define MGAREG_C2CTL_PIXCLKSEL_VDCLK (0x01 << 14) + +#define MGAREG_C2CTL_PIXCLKSEL_CRISTAL (0x01 << 1) | (0x01 << 14) +#define MGAREG_C2CTL_PIXCLKSEL_SYSTEMPLL (0x02 << 1) | (0x01 << 14) + +#define MGAREG_C2CTL_PIXCLKDIS_MASK (0x01 << 3) +#define MGAREG_C2CTL_PIXCLKDIS_DISABLE (0x01 << 3) + +#define MGAREG_C2CTL_CRTCDACSEL_MASK (0x01 << 20) +#define MGAREG_C2CTL_CRTCDACSEL_CRTC1 0x00 +#define MGAREG_C2CTL_CRTCDACSEL_CRTC2 (0x01 << 20) + #define MGAREG_C2HPARAM 0x3c14 #define MGAREG_C2HSYNC 0x3c18 #define MGAREG_C2VPARAM 0x3c1c ++++++ xf86-video-nv-1.2.1.tar.bz2 -> xf86-video-nv-1.2.2.tar.bz2 ++++++ ++++ 2957 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/ChangeLog new/xf86-video-nv-1.2.2/ChangeLog --- old/xf86-video-nv-1.2.1/ChangeLog 2006-12-01 19:57:41.000000000 +0100 +++ new/xf86-video-nv-1.2.2/ChangeLog 2006-12-16 00:48:56.000000000 +0100 @@ -1,3 +1,22 @@ +commit 10c7c54888d1dd4198c79e852c57420e8d52ccc5 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Dec 16 01:47:42 2006 +0200 + + bump to 1.2.2 + +commit 6d02bdb71bb34205955e76a99939a7be34c676c7 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Dec 6 18:48:37 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + +commit 33e10132a87409bdfa77d5eef9f7044cb9ce1ac9 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Mon Dec 4 12:52:55 2006 -0800 + + Remove redundant XORG_RELEASE_VERSION. + commit 2d4b4bb06029e60e5c7b96d94b31c8aadac91843 Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Nov 30 17:41:41 2006 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/Makefile.am new/xf86-video-nv-1.2.2/Makefile.am --- old/xf86-video-nv-1.2.1/Makefile.am 2006-06-30 03:38:19.000000000 +0200 +++ new/xf86-video-nv-1.2.2/Makefile.am 2006-12-06 17:48:19.000000000 +0100 @@ -23,8 +23,10 @@ EXTRA_DIST = README.NV1 ChangeLog -# Always regenerate the changelog CLEANFILES = ChangeLog -ChangeLog: FORCE - git-log > ChangeLog -FORCE: +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-nv-1.2.1/configure.ac new/xf86-video-nv-1.2.2/configure.ac --- old/xf86-video-nv-1.2.1/configure.ac 2006-12-01 02:41:34.000000000 +0100 +++ new/xf86-video-nv-1.2.2/configure.ac 2006-12-16 00:47:37.000000000 +0100 @@ -22,12 +22,10 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-nv], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nv) -XORG_RELEASE_VERSION - AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) ++++++ xf86-video-rendition-4.1.2.tar.bz2 -> xf86-video-rendition-4.1.3.tar.bz2 ++++++ ++++ 17468 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/ChangeLog new/xf86-video-rendition-4.1.3/ChangeLog --- old/xf86-video-rendition-4.1.2/ChangeLog 2006-11-05 19:02:34.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/ChangeLog 2006-12-16 00:55:42.000000000 +0100 @@ -1,3 +1,16 @@ +commit b3872c3317fe560d47a0a621d7a9bd6f81d3573a +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Dec 16 01:54:57 2006 +0200 + + bump to 4.1.3 + +commit 397370ab1099ae1231c9ae709c91a0ad74c82f2b +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Dec 6 18:49:28 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + commit 59db4ddcaee381595e4a134de3cc5f6eb8de4fe8 Author: Matthieu Herrb <matthieu@deville.herrb.com> Date: Sun Nov 5 19:01:56 2006 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/Makefile.am new/xf86-video-rendition-4.1.3/Makefile.am --- old/xf86-video-rendition-4.1.2/Makefile.am 2006-11-05 18:56:36.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/Makefile.am 2006-12-06 17:49:03.000000000 +0100 @@ -33,6 +33,6 @@ .PHONY: ChangeLog ChangeLog: - git-log > ChangeLog + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) dist-hook: ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/config.h.in new/xf86-video-rendition-4.1.3/config.h.in --- old/xf86-video-rendition-4.1.2/config.h.in 2006-11-05 19:02:34.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/config.h.in 2006-12-16 00:55:31.000000000 +0100 @@ -56,6 +56,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.2/configure.ac new/xf86-video-rendition-4.1.3/configure.ac --- old/xf86-video-rendition-4.1.2/configure.ac 2006-11-05 19:00:37.000000000 +0100 +++ new/xf86-video-rendition-4.1.3/configure.ac 2006-12-16 00:54:51.000000000 +0100 @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-rendition], - 4.1.2, + 4.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-rendition) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠suse.de