diff --git a/packages/x11/driver/xf86-video-fglrx/config/control b/packages/x11/driver/xf86-video-fglrx/config/control new file mode 100644 index 0000000000..394dc1ba24 Binary files /dev/null and b/packages/x11/driver/xf86-video-fglrx/config/control differ diff --git a/packages/x11/driver/xf86-video-fglrx/config/signature b/packages/x11/driver/xf86-video-fglrx/config/signature deleted file mode 100644 index 670c4b4774..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/config/signature +++ /dev/null @@ -1 +0,0 @@ -b67d452b67e1e4baee18b65de7643cc0:8e537c1d56ccd588de2c866886490df38148761a24cca5eea7388168d3560bf9:8e1870185082d5dedb2ed53e835104f8d21877485fd7d282d62e8264d7005af38e4c711350d7d5dbdc2cd53e865159a5d74a76135fd0d2828a2b836bd7065af9 \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install index 2ad83c6a17..e2920843f5 100755 --- a/packages/x11/driver/xf86-video-fglrx/install +++ b/packages/x11/driver/xf86-video-fglrx/install @@ -59,10 +59,10 @@ mkdir -p $INSTALL/etc/ati cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf ln -sf /storage/.config/fglrx.conf $INSTALL/etc/ati/amdpcsdb - cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati +# It looks like 12.6 needs the shipped signature but our control file cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati -# hack around a needless warning - cp $PKG_DIR/config/signature $INSTALL/etc/ati + cp $PKG_DIR/config/control $INSTALL/etc/ati + # DRI driver mkdir -p $INSTALL/usr/lib/dri diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index 834b67fb46..2e695b7a03 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -19,14 +19,12 @@ ################################################################################ PKG_NAME="xf86-video-fglrx" -#PKG_VERSION="12.4" -PKG_VERSION="8.98" +PKG_VERSION="12.6" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.ati.com/" -#PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" -PKG_URL="$DISTRO_SRC/amd-driver-installer-$PKG_VERSION-x86.x86_64.run" +PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" PKG_DEPENDS="linux libX11 libXinerama libXcomposite" PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux" PKG_PRIORITY="optional"