catalyst: update to 14.2-betav1.3 (latest beta).
This commit is contained in:
Juan RP
parent
0c4cd22c4c
commit
a942cb58a5
6 changed files with 16 additions and 164 deletions
|
|
@ -1,16 +0,0 @@
|
|||
# Create libGL and libglx symlinks for catalyst.
|
||||
case ${ACTION} in
|
||||
post)
|
||||
rm -f usr/lib/libGL.so usr/lib/libGL.so.1
|
||||
rm -f usr/lib/xorg/modules/extensions/libglx.so
|
||||
|
||||
# libGL
|
||||
cd usr/lib
|
||||
ln -sf fglrx-libGL.so.1.2 libGL.so
|
||||
ln -sf fglrx-libGL.so.1.2 libGL.so.1
|
||||
|
||||
# libglx
|
||||
cd ../../usr/lib/xorg/modules/extensions
|
||||
ln -sfr ./fglrx/fglrx-libglx.so libglx.so
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
# Restore mesa libGL and xorg-server libglx symlinks.
|
||||
case ${ACTION} in
|
||||
purge)
|
||||
rm -f usr/lib/libGL.so usr/lib/libGL.so.1
|
||||
rm -f usr/lib/xorg/modules/extensions/libglx.so
|
||||
|
||||
# libGL
|
||||
cd usr/lib
|
||||
if [ -f libGL-mesa.so.1.2.0 ]; then
|
||||
ln -sf libGL-mesa.so.1.2.0 libGL.so
|
||||
ln -sf libGL-mesa.so.1.2.0 libGL.so.1
|
||||
fi
|
||||
# libglx
|
||||
if [ -f xorg/modules/extensions/libglx-xorg.so ]; then
|
||||
cd xorg/modules/extensions
|
||||
ln -sf libglx-xorg.so libglx.so
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-22 19:52:37.000000000 +0100
|
||||
+++ 13.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-11-25 11:48:51.227678982 +0100
|
||||
@@ -778,7 +778,9 @@
|
||||
unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
|
||||
{
|
||||
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
|
||||
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
|
||||
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
|
||||
+ pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
|
||||
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
|
||||
pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
|
||||
#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
|
||||
pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
--- 13.4/common/lib/modules/fglrx/build_mod/kcl_agp.c 2013-05-24 16:45:52.236740084 -0400
|
||||
+++ 13.4/common/lib/modules/fglrx/build_mod/kcl_agp.c 2013-05-24 16:49:29.283579408 -0400
|
||||
@@ -56,6 +56,43 @@ unsigned int KCL_AGP_IsInUse(void)
|
||||
return kcl_agp_is_in_use;
|
||||
}
|
||||
|
||||
+/** \brief Find AGP caps registers in PCI config space
|
||||
+ ** \param dev PCI device handle
|
||||
+ ** \return Positive register index on success, negative errno on error
|
||||
+ */
|
||||
+int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
|
||||
+{
|
||||
+ u8 capndx;
|
||||
+ u32 cap_id;
|
||||
+
|
||||
+ if (!dev)
|
||||
+ {
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ pci_read_config_byte((struct pci_dev*)dev, 0x34, &capndx);
|
||||
+
|
||||
+ if (capndx == 0x00)
|
||||
+ {
|
||||
+ return -ENODATA;
|
||||
+ }
|
||||
+
|
||||
+ do
|
||||
+ { // search capability list for AGP caps
|
||||
+ pci_read_config_dword((struct pci_dev*)dev, capndx, &cap_id);
|
||||
+
|
||||
+ if ((cap_id & 0xff) == 0x02)
|
||||
+ {
|
||||
+ return capndx;
|
||||
+ }
|
||||
+
|
||||
+ capndx = (cap_id >> 8) & 0xff;
|
||||
+ }
|
||||
+ while (capndx != 0x00);
|
||||
+
|
||||
+ return -ENODATA;
|
||||
+}
|
||||
+
|
||||
#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
|
||||
|
||||
typedef struct {
|
||||
@@ -272,43 +309,6 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned
|
||||
}
|
||||
}
|
||||
|
||||
-/** \brief Find AGP caps registers in PCI config space
|
||||
- ** \param dev PCI device handle
|
||||
- ** \return Positive register index on success, negative errno on error
|
||||
- */
|
||||
-int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
|
||||
-{
|
||||
- u8 capndx;
|
||||
- u32 cap_id;
|
||||
-
|
||||
- if (!dev)
|
||||
- {
|
||||
- return -ENODEV;
|
||||
- }
|
||||
-
|
||||
- pci_read_config_byte((struct pci_dev*)dev, 0x34, &capndx);
|
||||
-
|
||||
- if (capndx == 0x00)
|
||||
- {
|
||||
- return -ENODATA;
|
||||
- }
|
||||
-
|
||||
- do
|
||||
- { // search capability list for AGP caps
|
||||
- pci_read_config_dword((struct pci_dev*)dev, capndx, &cap_id);
|
||||
-
|
||||
- if ((cap_id & 0xff) == 0x02)
|
||||
- {
|
||||
- return capndx;
|
||||
- }
|
||||
-
|
||||
- capndx = (cap_id >> 8) & 0xff;
|
||||
- }
|
||||
- while (capndx != 0x00);
|
||||
-
|
||||
- return -ENODATA;
|
||||
-}
|
||||
-
|
||||
/** \brief Get AGP caps
|
||||
** \param dev PCI device handle
|
||||
** \param caps pointer to caps vector
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- 13.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-17 20:05:35.000000000 +0100
|
||||
+++ 13.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-12-19 18:40:18.386568588 +0100
|
||||
@@ -995,7 +995,11 @@
|
||||
#endif
|
||||
{
|
||||
return KCL_ACPI_ERROR;
|
||||
- }
|
||||
+ }
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
|
||||
+ ((acpi_tbl_table_handler)handler)(hdr);
|
||||
+#else
|
||||
((acpi_table_handler)handler)(hdr);
|
||||
+#endif
|
||||
return KCL_ACPI_OK;
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
|
|
@ -2,25 +2,28 @@
|
|||
_desc="AMD catalyst driver for Linux"
|
||||
|
||||
pkgname=catalyst
|
||||
version=13.12
|
||||
revision=2
|
||||
_distver=14.2
|
||||
_patchver=betav1.3
|
||||
version=${_distver}${_patchver}
|
||||
revision=1
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
license="Propietary AMD license"
|
||||
homepage="http://www.amd.com"
|
||||
|
||||
only_for_archs="i686 x86_64"
|
||||
hostmakedepends="unzip wget"
|
||||
depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision}"
|
||||
depends="xserver-abi-video<16 ${pkgname}-dkms-${version}_${revision}"
|
||||
conflicts="nvidia>=0"
|
||||
provides="libGL-${version}_${revision}"
|
||||
replaces="libGL>=0"
|
||||
short_desc="${_desc} - Libraries and Utilities"
|
||||
nonfree=yes
|
||||
create_wrksrc=yes
|
||||
|
||||
XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
|
||||
|
||||
distfiles="http://www2.ati.com/drivers/linux/amd-catalyst-${version}-linux-x86.x86_64.zip"
|
||||
checksum=024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca
|
||||
|
||||
distfiles="http://www2.ati.com/drivers/beta/amd-catalyst-${_distver}-${_patchver}-linux-x86.x86_64.zip"
|
||||
checksum=b729fa327fbc030d9e73266997cbbba3186c6ba3f2d3059b9adf6bf9ab5d63cd
|
||||
|
||||
if [ "$XBPS_MACHINE" = "i686" ]; then
|
||||
_ARCHDIR="x86"
|
||||
|
|
@ -32,10 +35,10 @@ fi
|
|||
|
||||
do_build() {
|
||||
chmod 755 *.run
|
||||
./amd-catalyst-*.run --extract fglrx
|
||||
./amd-driver-*.run --extract fglrx
|
||||
}
|
||||
|
||||
pre_install() {
|
||||
post_build() {
|
||||
cd ${wrksrc}/fglrx
|
||||
|
||||
for f in ${FILESDIR}/*.patch; do
|
||||
|
|
@ -66,13 +69,17 @@ do_install() {
|
|||
install -m755 *.so ${DESTDIR}/usr/lib/xorg/modules/
|
||||
install -m755 drivers/*.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
|
||||
install -m755 linux/*.so ${DESTDIR}/usr/lib/xorg/modules/linux/
|
||||
install -m755 extensions/fglrx/fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/fglrx/
|
||||
install -m755 extensions/fglrx/fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions
|
||||
ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
|
||||
ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
|
||||
|
||||
cd ${wrksrc}/fglrx/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
|
||||
|
||||
install -m755 modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
|
||||
ln -sfr ${DESTDIR}/usr/lib/xorg/modules/drivers/fglrx_dri.so ${DESTDIR}/usr/lib/dri/fglrx_dri.so
|
||||
install -m755 fglrx/fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/
|
||||
ln -sf fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/libGL.so
|
||||
ln -sf fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/libGL.so.1
|
||||
install -m755 *.so* ${DESTDIR}/usr/lib/
|
||||
install -m644 libAMDXvBA.cap ${DESTDIR}/usr/lib/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue