Permalink
Browse files

Merge branch 'master' of github.com:/lunar-linux/moonbase-xorg

  • Loading branch information...
2 parents 8bd8c5d + c3daed4 commit 9706673ba1188bd29fb7c3451a43e5cc38ae927f @ahkok ahkok committed Dec 14, 2012
View
@@ -15,6 +15,8 @@
# this is a harmless debugging line and AF_LINK is currently undefined over here
sedit '/AF_LINK/d' hacks/glx/sonar-icmp.c &&
+ # remove unnecessary #endif
+ sedit '597d' hacks/glx/sonar-icmp.c &&
default_build
View
@@ -6,10 +6,10 @@ depends perl
optional_depends "gettext" "" "" \
"enable NLS support"
-optional_depends "glade3" "--with-gtk" "--without-gtk" \
+optional_depends "glade2" "--with-gtk" "--without-gtk" \
"to build the GNOME configuration manager"
-optional_depends "fortune" "--with-fortune=/usr/games/fortune" "" \
+optional_depends "fortune" "" "" \
"allow fortune to be used as a text source in screensavers"
optional_depends "appres" "" "" \
View
@@ -1,8 +1,8 @@
MODULE=xscreensaver
- VERSION=5.18
+ VERSION=5.20
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE_URL=http://www.jwz.org/$MODULE
- SOURCE_VFY=sha1:a9f66d3f5094d2c1ef46c1209730e7cb653f33a7
+ SOURCE_VFY=sha1:052cc6676fe7818ec4131f41942266c237acdced
WEB_SITE=http://www.jwz.org/xscreensaver
ENTERED=20010922
UPDATED=20120724
@@ -1,12 +1,12 @@
MODULE=xf86-input-wacom
- VERSION=0.17.0
+ VERSION=0.18.0
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=$SFORGE_URL/linuxwacom/${MODULE}
- SOURCE_VFY=sha1:83fc86df97d1279198a7dab9f7d98fceded068ad
+ SOURCE_VFY=sha1:ac2b8f8d9fb4164ceb209132eb0e17a5311baf19
MODULE_PREFIX=${X11R7_PREFIX:-/usr}
WEB_SITE=http://www.x.org
ENTERED=20110925
- UPDATED=20120911
+ UPDATED=20121030
SHORT="The X.Org wacom tablet input device driver"
cat << EOF
@@ -1,12 +1,12 @@
MODULE=xf86-video-intel
- VERSION=2.20.8
+ VERSION=2.20.15
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=$XORG_URL/individual/driver
- SOURCE_VFY=sha1:c0b1dbe010ba424d04397ee812cb1f50f8f0da81
+ SOURCE_VFY=sha1:1c0f96f869b6d095760dd0783f59bc2f220cb9fe
MODULE_PREFIX=${X11R7_PREFIX:-/usr}
WEB_SITE=http://www.x.org
ENTERED=20060124
- UPDATED=20120916
+ UPDATED=20121203
SHORT="The X.Org video driver for Intel based cards"
cat << EOF
@@ -1,12 +1,12 @@
MODULE=xf86-video-nouveau
- VERSION=1.0.2
+ VERSION=1.0.4
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=$XORG_URL/individual/driver
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
- SOURCE_VFY=sha1:8f89db34187e3476c22de85fa5156a4296241b52
+ SOURCE_VFY=sha1:68d4aa7269f3570938698f6a08b2640626193ea6
WEB_SITE=http://nouveau.freedesktop.org/wiki
ENTERED=20120405
- UPDATED=20120405
+ UPDATED=20121109
SHORT="Open Source 2D NVidia drivers"
cat <<EOF
View
@@ -1,12 +1,12 @@
MODULE=font-util
- VERSION=1.2.0
+ VERSION=1.3.0
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=$XORG_URL/individual/font
- SOURCE_VFY=sha1:011fa9c8fe08d9f6f848df570374ed1cb7488146
+ SOURCE_VFY=sha1:a015f4c5a35d98af72835797293697e0eb9cd506
MODULE_PREFIX=${X11R7_PREFIX:-/usr}
WEB_SITE=http://www.x.org
ENTERED=20060120
- UPDATED=20101017
+ UPDATED=20121023
SHORT="X.Org font utilities"
cat << EOF
View
@@ -6,20 +6,27 @@
fi
# There is a documented issue when the user does not have a
- # timezone set (/etc/localtime). It creates invalid XML
+ # timezone set (/etc/localtime). It creates invalid XML
# syntax in a comment located in /etc/fonts/fonts.conf.
- sedit "s:\`date\`::" configure &&
+ sedit "s:\`date\`::" configure &&
- ./configure --prefix=/usr \
- --with-confdir=/etc/fonts \
- --disable-static \
- --with-cache-dir=/var/cache/fontconfig \
- $OPTS &&
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-templatedir=/etc/fonts/conf.avail \
+ --with-xmldir=/etc/fonts \
+ --localstatedir=/var \
+ --disable-static \
+ --with-default-fonts=/usr/share/fonts \
+ --with-add-fonts=/usr/share/fonts \
+ $OPTS &&
- default_make &&
- install -m644 $SCRIPT_DIRECTORY/10-lunar-fonts.conf \
- /etc/fonts/conf.d/
+# sedit "s:(BASECONFIGDIR):(CONFIGDIR):" Makefile &&
+
+ default_make &&
+
+ install -m644 $SCRIPT_DIRECTORY/10-lunar-fonts.conf \
+ /etc/fonts/conf.d/
) > $C_FIFO 2>&1
View
@@ -1,11 +1,11 @@
MODULE=fontconfig
- VERSION=2.8.0
+ VERSION=2.10.2
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE_URL=http://www.fontconfig.org/release/
- SOURCE_VFY=sha1:570fb55eb14f2c92a7b470b941e9d35dbfafa716
- WEB_SITE=http://www.fontconfig.org/
+ SOURCE_URL=http://www.fontconfig.org/release
+ SOURCE_VFY=sha1:3999fc8a850c3bd07c71837f0579ec66378e1ebf
+ WEB_SITE=http://www.fontconfig.org
ENTERED=20030425
- UPDATED=20100214
+ UPDATED=20121130
SHORT="A library for configuring and customizing font access"
cat << EOF
View
@@ -1,12 +1,11 @@
MODULE=libxklavier
- MAJOR=5.1
- VERSION=$MAJOR
- SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
- SOURCE_VFY=sha1:9ea0e705fbfa2c816babe8db632a59ccf98f6607
+ VERSION=5.3
+ SOURCE=$MODULE-$VERSION.tar.xz
+ SOURCE_URL=$GNOME_URL/sources/$MODULE/${VERSION::3}
+ SOURCE_VFY=sha1:dc5e824c738520229174ba9481f0cab35be4870f
WEB_SITE=http://www.freedesktop.org/wiki/Software/LibXklavier
ENTERED=20031201
- UPDATED=20110409
+ UPDATED=20121024
SHORT="library providing high-level API for XKB"
cat << EOF
View
@@ -53,18 +53,20 @@ if ! grep -q "MESADRIVER=" $MODULE_CONFIG; then
set_module_config MESADRIVER "$MESADRIVER"
fi
-message "${MESSAGE_COLOR}Gallium is an alternative to DRI and needed to do 3D acceleration on"
-message "nouveau, radeon(-hd), ati or Intel GMA (Poulsbo/Cedar Trail). However, Gallium is not"
-message "performing on Intel GENX graphics (Any onboard Corei3/5/7, G25/33/45, pinetrail gfx"
-message ""
-message "Open Source Drivers:"
-message "If you build for Intel DRI-based hardware, disable Gallium, llvm and enable libva, xvmc."
-message "If you build for Intel CedarTrail or Poulsbo, enable Gallium, llvm, xvmc, vdpau."
-message "If you build for NVidia or Ati hardware, enable Gallium, llvm, xvmc, vdpau."
-message ""
-message "Binary / Proprietary Drivers:"
-message "If building the NVIDIA/fglrx binary driver, disable gallium, llvm, vdpau, xvmc."
-message "${DEFAULT_COLOR}"
+if [[ -z "$(get_module_config CONFIGURED)" ]]; then
+ message "${MESSAGE_COLOR}Gallium is an alternative to DRI and needed to do 3D acceleration on"
+ message "nouveau, radeon(-hd), ati or Intel GMA (Poulsbo/Cedar Trail). However, Gallium is not"
+ message "performing on Intel GENX graphics (Any onboard Corei3/5/7, G25/33/45, pinetrail gfx"
+ message ""
+ message "Open Source Drivers:"
+ message "If you build for Intel DRI-based hardware, disable Gallium, llvm and enable libva, xvmc."
+ message "If you build for Intel CedarTrail or Poulsbo, enable Gallium, llvm, xvmc, vdpau."
+ message "If you build for NVidia or Ati hardware, enable Gallium, llvm, xvmc, vdpau."
+ message ""
+ message "Binary / Proprietary Drivers:"
+ message "If building the NVIDIA/fglrx binary driver, disable gallium, llvm, vdpau, xvmc."
+ message "${DEFAULT_COLOR}"
+fi
mquery GALLIUM "Enable Gallium llvm renderer?" y "--enable-gallium-llvm" "--disable-gallium-llvm"
@@ -89,3 +91,5 @@ else
fi
mquery TEXTURE_FLOAT "Enable patented texture-float? (if this patent is valid in your country choose N)" n "--enable-texture-float" "--disable-texture-float"
mquery ENABLE_GLX_TLS "Enable glx-tls? (lin -r xorg-server also)" y "--enable-glx-tls" "--disable-glx-tls"
+
+set_module_config CONFIGURED y
View
@@ -1,12 +1,12 @@
MODULE=mesa-lib
- VERSION=9.0
+ VERSION=9.0.1
SOURCE=MesaLib-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
SOURCE_URL=ftp://ftp.freedesktop.org/pub/mesa/$VERSION
- SOURCE_VFY=sha1:dcddfd6b6b4a4ed4f7123ca75fd0108007bbad74
+ SOURCE_VFY=sha1:e98e26d8007008b4d2d410778ed5254b32c71b99
WEB_SITE=http://www.mesa3d.org
ENTERED=20060215
- UPDATED=20121012
+ UPDATED=20121118
SHORT="Mesa 3D library"
cat << EOF
View
@@ -1,12 +1,12 @@
MODULE=pixman
- VERSION=0.26.2
+ VERSION=0.28.0
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL=$XORG_URL/individual/lib
- SOURCE_VFY=sha1:1daf014714cc29147726abada12359345d156705
+ SOURCE_VFY=sha1:cfc7a18a8811bf4ff0890f547c315bda8097f6ad
MODULE_PREFIX=${X11R7_PREFIX:-/usr}
WEB_SITE=http://www.x.org
ENTERED=20070809
- UPDATED=20120812
+ UPDATED=20121108
SHORT="Low-level pixel manipulation routine library"
cat << EOF
View
@@ -1,12 +1,12 @@
MODULE=xterm
- VERSION=284
+ VERSION=287
SOURCE=$MODULE-$VERSION.tgz
SOURCE_URL=ftp://invisible-island.net/xterm
- SOURCE_VFY=sha1:522fd17211bb2b01ffcb8181ef4c558a1c61c4f5
+ SOURCE_VFY=sha1:f1c4bfd11394eaa8158559cea63180fe7cc8d3ed
MODULE_PREFIX=${X11R7_PREFIX:-/usr}
WEB_SITE=http://invisible-island.net/xterm
ENTERED=20060124
- UPDATED=20121017
+ UPDATED=20121127
SHORT="The X terminal emulator"
cat << EOF

0 comments on commit 9706673

Please sign in to comment.