Changeset 1735

Timestamp:

10/18/06 10:11:19 (2 years ago)

Author:

alexander

Message:

Upgraded to Xorg-7.1

Location:

branches/6.2

Files:

• Makefile (modified) (2 diffs)
• packages/Mesa (added)
• packages/Mesa/Makefile (added)
• packages/Xorg-app (added)
• packages/Xorg-app/Makefile (added)
• packages/Xorg-base (added)
• packages/Xorg-base/Makefile (added)
• packages/Xorg-driver (added)
• packages/Xorg-driver/Makefile (added)
• packages/Xorg-font (added)
• packages/Xorg-font/Makefile (added)
• packages/Xorg-lib (added)
• packages/Xorg-lib/Makefile (added)
• packages/Xorg-proto (added)
• packages/Xorg-proto/Makefile (added)
• packages/Xorg-util (added)
• packages/Xorg-util/Makefile (added)
• packages/ddccontrol/Makefile (modified) (1 diff)
• packages/libdrm (added)
• packages/libdrm/Makefile (added)
• packages/libpng/Makefile (modified) (1 diff)
• packages/proprietary-drivers/Makefile (modified) (1 diff)
• packages/vbetool/Makefile (modified) (1 diff)
• packages/xbitmaps (added)
• packages/xbitmaps/Makefile (added)
• packages/xcursor-themes (added)
• packages/xcursor-themes/Makefile (added)
• packages/xkeyboard-config (added)
• packages/xkeyboard-config/Makefile (added)
• packages/xorg-server (added)
• packages/xorg-server/Makefile (added)
• packages/xorg-server/xorg_server-1.1.1-dotclock-1.patch (added)
• packages/xorg-server/xorg_server-1.1.1-newmesa-1.patch (added)
• vars/vars.ppc (modified) (1 diff)
• vars/vars.sparc (modified) (1 diff)
• vars/vars.x86 (modified) (1 diff)

branches/6.2/Makefile

@@ -241 +241 @@
         ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
         ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
-        ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype \
-        ch-fontconfig ch-Xorg-modular ch-synaptics ch-inputattach \
+        ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng \
+        ch-freetype ch-fontconfig \
+        ch-Xorg-base ch-Xorg-util ch-Xorg-proto ch-Xorg-lib ch-libdrm ch-Mesa \
+        ch-xbitmaps ch-Xorg-app ch-xcursor-themes ch-xorg-server \
+        ch-Xorg-font ch-Xorg-driver ch-XML-Parser ch-xkeyboard-config \
+        ch-synaptics ch-inputattach \
         ch-freefont ch-fonts-dejavu ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk \
         ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib ch-imlib ch-imlib2 \
@@ -248 +252 @@
         ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-seamonkey \
         ch-librsvg ch-startup-notification chroot-gvim ch-xfce ch-vte ch-exo \
-        ch-XML-Parser ch-Terminal ch-mousepad ch-irssi ch-gaim \
+        ch-Terminal ch-mousepad ch-irssi ch-gaim \
         ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
         ch-traceroute ch-rsync ch-jhalfs ch-sudo ch-bc \

branches/6.2/packages/ddccontrol/Makefile

@@ -26 +26 @@
         sed -i 's|sys/io.h|asm/io.h|' src/ddcpci/intel810.c
 endif
-        ./configure --prefix=/usr --disable-gnome-applet
+        LIBS="-lz" ./configure --prefix=/usr --disable-gnome-applet
         make $(PM)
         make install

branches/6.2/packages/libpng/Makefile

@@ -24 +24 @@
         make
         make install
+        # Stray symlink because we disable static libraries
+        rm -f /usr/lib/libpng.a
         install -v -m755 -d /usr/share/doc/$(DIR)
         install -v -m644 README libpng.txt /usr/share/doc/$(DIR)

branches/6.2/packages/proprietary-drivers/Makefile

@@ -5 +5 @@
 
 # NVIDIA legacy driver
-FILE1= NVIDIA-Linux-x86-1.0-7182-pkg0.run
-URL-$(FILE1)= http://download.nvidia.com/XFree86/Linux-x86/1.0-7182/$(FILE1)
-SHA-$(FILE1)= 263244a24eab5334c77afbcda3534dba67fa0e51
+FILE1= NVIDIA-Linux-x86-1.0-7184-pkg0.run
+URL-$(FILE1)= http://download.nvidia.com/XFree86/Linux-x86/1.0-7184/$(FILE1)
+SHA-$(FILE1)= ba3cfc1734c179cee628fba89ce557dfc0e78e31
 
 # Current NVIDIA driver
-FILE2= NVIDIA-Linux-x86-1.0-8762-pkg0.run
-URL-$(FILE2)= http://download.nvidia.com/XFree86/Linux-x86/1.0-8762/$(FILE2)
-SHA-$(FILE2)= d186a4b31177dad951dcb0f0c15adad06d800962
+FILE2= NVIDIA-Linux-x86-1.0-9626-pkg0.run
+URL-$(FILE2)= http://download.nvidia.com/XFree86/Linux-x86/1.0-9626/$(FILE2)
+SHA-$(FILE2)= a50e04f2db7a382e60b98330d69b406e8328e436
 
 # ATI FGLRX driver
-FILE3= ati-driver-installer-8.26.18-x86.run
+FILE3= ati-driver-installer-8.29.6.run
 URL-$(FILE3)= http://www2.ati.com/drivers/linux/$(FILE3)
-SHA-$(FILE3)= 5c84a8d3526accccb0154c9d701948629f7ae45d
+SHA-$(FILE3)= db53f411fa076bc927023f2636171b474aa360f0
 
 # Targets

branches/6.2/packages/vbetool/Makefile

@@ -22 +22 @@
 
 compile-stage2:
-        ./configure --prefix=/usr
+        LIBS="-lz" ./configure --prefix=/usr
         make
         make install

branches/6.2/vars/vars.ppc

@@ -1 @@
-export VERSION := ppc-6.2-3
+export VERSION := ppc-6.2-4
 export CFLAGS := -Os -s -fno-strict-aliasing
 export LINKER := ld.so.1

branches/6.2/vars/vars.sparc

@@ -1 @@
-export VERSION := sparc-6.2-3
+export VERSION := sparc-6.2-4
 export CFLAGS := -Os -s -fno-strict-aliasing
 export LFS_TARGET := sparc-unknown-linux-gnu

branches/6.2/vars/vars.x86

@@ -1 @@
-export VERSION := x86-6.2-3
+export VERSION := x86-6.2-4
 export CFLAGS := -Os -s -fno-strict-aliasing -mtune=i686
 export LINKER := ld-linux.so.2