From 95ef318497ab70d97d3d19d8aef6debf3601600b Mon Sep 17 00:00:00 2001 From: Kyle Hill Date: Mon, 16 Jul 2012 21:54:00 -0500 Subject: [PATCH 1/2] Update xf86-video-intel to 2.20.0 from 2.19.0 This new version fixes a host of SNA-related bugs. The full release announcement can be seen here: http://lists.x.org/archives/xorg-announce/2012-July/002004.html Additionally, this release contains a fix for an issue that would disable HDMI output on resume from S3 suspend when connected to a receiver. See https://bugs.freedesktop.org/show_bug.cgi?id=50078 for more information. --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 0aeb352164..b5d316205a 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-intel" -PKG_VERSION="2.19.0" +PKG_VERSION="2.20.0" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" From 47f270d7423d4559c70bb9c84ba6217d4a0a403c Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Tue, 17 Jul 2012 10:08:03 +0200 Subject: [PATCH 2/2] config/path: check for multiple package folders --- config/path | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/path b/config/path index 37d1eb4fe7..7c56c5fd93 100644 --- a/config/path +++ b/config/path @@ -54,7 +54,13 @@ SED="sed -i" PKG_LONGDESC="" PKG_IS_ADDON="no" - [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null` + if [ -n "$1" ]; then + PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null` + if [[ $PKG_DIR = *$'\n'* ]]; then + echo -e "Error - multiple package folders:\n$PKG_DIR" + exit 1 + fi + fi [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"