diff --git a/srcpkgs/catalyst/INSTALL b/srcpkgs/catalyst/INSTALL index a9b81a19fc..3ab077b44e 100644 --- a/srcpkgs/catalyst/INSTALL +++ b/srcpkgs/catalyst/INSTALL @@ -11,6 +11,6 @@ post) # libglx cd ../../usr/lib/xorg/modules/extensions - ln -sf ../fglrx/fglrx-libglx.so libglx.so + ln -sfr ./fglrx/fglrx-libglx.so libglx.so ;; esac diff --git a/srcpkgs/catalyst/catalyst-dkms.template b/srcpkgs/catalyst/catalyst-dkms.template index dfbef31728..3e4569ba4a 100644 --- a/srcpkgs/catalyst/catalyst-dkms.template +++ b/srcpkgs/catalyst/catalyst-dkms.template @@ -13,6 +13,7 @@ do_install() { vmkdir usr/src/${_fglrx} cd ${wrksrc}/fglrx + patch -Np0 -i ${FILESDIR}/uapi_linux_version_make.patch cp -r common/lib/modules/fglrx/build_mod/* ${DESTDIR}/usr/src/${_fglrx} vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a \ diff --git a/srcpkgs/catalyst/files/uapi_linux_version_make.patch b/srcpkgs/catalyst/files/uapi_linux_version_make.patch new file mode 100644 index 0000000000..48212f3830 --- /dev/null +++ b/srcpkgs/catalyst/files/uapi_linux_version_make.patch @@ -0,0 +1,21 @@ +Use uapi/linux/version.h if linux/version.h not found. + +--- common/lib/modules/fglrx/build_mod/make.sh.orig 2013-02-07 19:17:27.405645903 +0100 ++++ common/lib/modules/fglrx/build_mod/make.sh 2013-02-07 19:19:05.549150417 +0100 +@@ -203,11 +203,16 @@ cd $current_wd + # sample: #define UTS_RELEASE "2.4.0-test7" + + src_file=$linuxincludes/linux/version.h ++src_file_new=$linuxincludes/generated/uapi/linux/version.h + + if [ ! -e $src_file ]; then ++ if [ ! -e $src_file_new ]; then + echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile + echo "file: $src_file" | tee -a $logfile + exit 1 ++ else ++ src_file=$src_file_new ++ fi + fi + + OsRelease=${uname_r} diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 0a3503e824..e35369d28b 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -1,7 +1,7 @@ # Template file for 'catalyst' pkgname=catalyst version=13.1 -revision=2 +revision=3 short_desc="AMD catalyst driver for Linux -- libraries and utilities" maintainer="Juan RP " license="Propietary AMD license"