summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <tnut at nutyx dot com>2011-07-03 11:29:57 +0200
committertnut <tnut at nutyx dot com>2011-07-03 11:29:57 +0200
commit9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55 (patch)
tree3d092a540c65eeb4e2943be959cadac1e75b5fc3
parent083af5eb89d16f9c1686af1d4e7dcb8bbcef571e (diff)
parent02ac6c625ee14e209cc2f91a1e5b1a305cfbfcb4 (diff)
downloadnutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.gz
nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.bz2
nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.xz
nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat
-rw-r--r--base/kernel/config26
-rw-r--r--extra/gtk/.footprint.i68612
-rw-r--r--extra/gtk/.footprint.x86_6412
-rw-r--r--extra/gtk/.md5sum.i6862
-rwxr-xr-xextra/gtk/Pkgfile2
5 files changed, 25 insertions, 29 deletions
diff --git a/base/kernel/config b/base/kernel/config
index eb30c2283..68d278cf2 100644
--- a/base/kernel/config
+++ b/base/kernel/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/i386 2.6.39 Kernel Configuration
-# Fri Jun 24 21:48:52 2011
+# Sat Jul 2 23:17:22 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -3760,7 +3760,7 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
CONFIG_DRM_RADEON_KMS=y
-# CONFIG_DRM_I810 is not set
+CONFIG_DRM_I810=m
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
@@ -3817,27 +3817,23 @@ CONFIG_FB_RIVA=m
CONFIG_FB_RIVA_I2C=y
# CONFIG_FB_RIVA_DEBUG is not set
CONFIG_FB_RIVA_BACKLIGHT=y
-# CONFIG_FB_I810 is not set
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
CONFIG_FB_LE80578=m
CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_INTEL is not set
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
CONFIG_FB_MATROX=m
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_I2C=m
CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
CONFIG_FB_S3=m
CONFIG_FB_SAVAGE=m
CONFIG_FB_SAVAGE_I2C=y
diff --git a/extra/gtk/.footprint.i686 b/extra/gtk/.footprint.i686
index 94ee42091..f423c4d07 100644
--- a/extra/gtk/.footprint.i686
+++ b/extra/gtk/.footprint.i686
@@ -327,13 +327,13 @@ lrwxrwxrwx root/root usr/lib/libgailutil.so -> libgailutil.so.18.0.1
lrwxrwxrwx root/root usr/lib/libgailutil.so.18 -> libgailutil.so.18.0.1
-rwxr-xr-x root/root usr/lib/libgailutil.so.18.0.1
-rw-r--r-- root/root usr/lib/libgdk-x11-2.0.la
-lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.4
-lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.4
--rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.4
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.5
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.5
+-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.5
-rw-r--r-- root/root usr/lib/libgtk-x11-2.0.la
-lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.4
-lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.4
--rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.4
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.5
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.5
+-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.5
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gail.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc
diff --git a/extra/gtk/.footprint.x86_64 b/extra/gtk/.footprint.x86_64
index 94ee42091..f423c4d07 100644
--- a/extra/gtk/.footprint.x86_64
+++ b/extra/gtk/.footprint.x86_64
@@ -327,13 +327,13 @@ lrwxrwxrwx root/root usr/lib/libgailutil.so -> libgailutil.so.18.0.1
lrwxrwxrwx root/root usr/lib/libgailutil.so.18 -> libgailutil.so.18.0.1
-rwxr-xr-x root/root usr/lib/libgailutil.so.18.0.1
-rw-r--r-- root/root usr/lib/libgdk-x11-2.0.la
-lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.4
-lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.4
--rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.4
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.5
+lrwxrwxrwx root/root usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.5
+-rwxr-xr-x root/root usr/lib/libgdk-x11-2.0.so.0.2400.5
-rw-r--r-- root/root usr/lib/libgtk-x11-2.0.la
-lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.4
-lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.4
--rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.4
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.5
+lrwxrwxrwx root/root usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.5
+-rwxr-xr-x root/root usr/lib/libgtk-x11-2.0.so.0.2400.5
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gail.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gdk-2.0.pc
diff --git a/extra/gtk/.md5sum.i686 b/extra/gtk/.md5sum.i686
index 01b6df1ba..eec88cb1e 100644
--- a/extra/gtk/.md5sum.i686
+++ b/extra/gtk/.md5sum.i686
@@ -1 +1 @@
-e05a700ba79c8813d56e83e80636ee21 gtk+-2.24.4.tar.bz2
+aebeb2e9efc2e541dc9631546aed7900 gtk+-2.24.5.tar.bz2
diff --git a/extra/gtk/Pkgfile b/extra/gtk/Pkgfile
index eb0a31863..e0a20de0c 100755
--- a/extra/gtk/Pkgfile
+++ b/extra/gtk/Pkgfile
@@ -6,7 +6,7 @@
# Run on: cairo,pango,atk,libtiff,gdk-pixbuf,shared-mime-info,libcups,kerberos,xorg-libxi,xorg-libxcursor
name=gtk
-version=2.24.4
+version=2.24.5
release=1
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${version%.*}/gtk+-$version.tar.bz2)
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-22 12:24:54 +0000