16.60.379184-1

author: David McFarland 2017-02-07 08:11:35 -0400
committer: David McFarland 2017-02-07 08:11:35 -0400
commit: 2a51bcdea913f0f5f952b3d0254aca4846de8a36 (patch)
tree: aabf174ee04afd42425504636399354b1ca95b30 /PKGBUILD
parent: 22ed57d1112fe758eb8f637246b6342687031dbf (diff)
download: aur-2a51bcdea913f0f5f952b3d0254aca4846de8a36.tar.gz
1 files changed, 260 insertions, 880 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3d0e6998c2c1..b780235387d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,992 +3,372 @@
 # Autogenerated from AMD's Packages file
 
 pkgbase=amdgpu-pro-installer
-pkgname=(amdgpu-pro amdgpu-pro-clinfo amdgpu-pro-computing amdgpu-pro-core amdgpu-pro-dkms amdgpu-pro-firmware amdgpu-pro-graphics lib32-amdgpu-pro-lib32 lib32-amdgpu-pro-libopencl-dev amdgpu-pro-libopencl-dev amdgpu-pro-libopencl1 lib32-amdgpu-pro-libopencl1 amdgpu-pro-opencl-icd lib32-amdgpu-pro-opencl-icd amdgpu-pro-vulkan-driver lib32-amdgpu-pro-vulkan-driver libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-amdgpu1 lib32-libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-dev libdrm-amdgpu-pro-tools libdrm2-amdgpu-pro lib32-libdrm2-amdgpu-pro libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro lib32-libegl1-amdgpu-pro-dev libegl1-amdgpu-pro-dev libgbm-amdgpu-pro-dev lib32-libgbm-amdgpu-pro-dev libgbm1-amdgpu-pro lib32-libgbm1-amdgpu-pro lib32-libgl1-amdgpu-pro-dev libgl1-amdgpu-pro-dev lib32-libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-dri libgl1-amdgpu-pro-glx lib32-libgl1-amdgpu-pro-glx libgles2-amdgpu-pro lib32-libgles2-amdgpu-pro libgles2-amdgpu-pro-dev lib32-libgles2-amdgpu-pro-dev lib32-libvdpau-amdgpu-pro libvdpau-amdgpu-pro xserver-xorg-video-amdgpu-pro)
-if [ "$ALL_PACKAGES" = "true" ]; then
-	pkgname+=()
-fi
-pkgver=16.30.3.315407
-pkgrel=2
+pkgname=(amdgpu-pro amdgpu-pro-dkms amdgpu-pro-libdrm amdgpu-pro-libgl amdgpu-pro-opencl amdgpu-pro-vdpau amdgpu-pro-vulkan lib32-amdgpu-pro lib32-amdgpu-pro-libdrm lib32-amdgpu-pro-libgl lib32-amdgpu-pro-opencl lib32-amdgpu-pro-vdpau lib32-amdgpu-pro-vulkan xf86-video-amdgpu-pro)
+pkgver=16.60.379184
+pkgrel=1
 arch=('x86_64')
 url='http://www.amd.com'
 license=('custom:AMD')
 makedepends=('wget')
 
-DLAGENTS='https::/usr/bin/wget --referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx -N %u'
-
-source=(https://www2.ati.com/drivers/linux/amdgpu-pro_16.30.3-315407.tar.xz
-	0001-add-OS-detection-for-arch.patch
-	0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch
-	0003-add-kcl_drm_gem_object_lookup.patch
-	0004-paging-changes-for-linux-4.6.patch
-	0005-LRU-stuff-isn-t-available-until-4.7.x.patch
-	0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch
-	0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch
-	0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch
-	0009-disable-dal-by-default.patch
-	0010-remove-dependency-on-System.map.patch)
-sha256sums=(97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354
-	ae5fed04cd626aadff6d4c7c59657f52a8dd6be3df4a9686702e74aa8c72d1de
-	df36d1d9f470094432b765016b558624fa9b28355c82a722f7bd4facdf912ce2
-	4afabc203dc52a8ad15f1d4dc62887d1a11472f11c1aa9f9adb8affc183f297b
-	0a0657826270a963be76f9e3a882432df4f6ac0628dd0966289cc5c064cadeb6
-	fe0075575bae0a7f76daa0686ab23464b867ef8ed0b4d39cec4bd566ec39f99c
-	a0e94234555f5254df096a93e050edbc341603d0b1d527f7b0c3179e111b7be1
-	2e291935e35ecdc9f7c87d288db9d73a27f4f5cc3b08f95b8b39fef3934c6735
-	50c56c4e2ed55d66e5d5e5689b2f146de63dbb3edc2bafabf5ca98e8ae58e028
-	7e5640468e9ede54a8b3cc8fd67d6c3ae3738aec959a655c9aeaac9570a646f9
-	2f6c74a5a909f27a5a18eae5acf2ca90c99c4f2e4aa8ceb766dbf8a0cb431817)
-
-
-package_amdgpu-pro () {
-	pkgdesc="This package install all amdgpu-pro components."
-	depends=('amdgpu-pro-graphics=16.30.3.315407-2' 'amdgpu-pro-computing=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_amdgpu-pro-clinfo () {
-	pkgdesc="AMD OpenCL info utility"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-clinfo_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-clinfo_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_amdgpu-pro-computing () {
-	pkgdesc="This package install amdgpu-pro OpenCL components."
-	depends=('amdgpu-pro-core=16.30.3.315407-2' 'amdgpu-pro-clinfo=16.30.3.315407-2' 'amdgpu-pro-opencl-icd=16.30.3.315407-2' 'amdgpu-pro-libopencl-dev=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-computing_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-computing_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
+DLAGENTS='https::/usr/bin/wget --referer https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Install.aspx -N %u'
+
+source=(https://www2.ati.com/drivers/linux/ubuntu/amdgpu-pro-16.60-379184.tar.xz
+	0001-add-archlinux-as-build-option.patch
+	0002-fix_get_user_pages_calls.patch
+	0003-fix_drm_connector.patch
+	0004-Change-seq_printf-format-for-64-bit-context.patch
+	0005-fix_drm_vma_node_verify_access.patch
+	0006-fix_dm_plane_helper_funcs.patch
+	0007-disable-dal-by-default.patch)
+sha256sums=(d88b5a747ac765a75eb738aaf5641428c3b1c9c02bc6fde452c423de7dd620bd
+	400df0077464003fad74bb77a8f6e5ba24bffc7c2e32e6b3f0dab08a17eb3486
+	5708b6641bd62fe768e1cb36f88d0895c4fdf90d1d3110033bafdabc47fe1e31
+	b6a98ed84733bab544461991f642dc1a73ee065b32f7c1b3a235d5e2bc814943
+	21c78811107d8ee59f3566d21ed4a7ccfd622f4e07350fca7ed662392ab07190
+	885330f3749db53a491b7c35c7e0d9d58965a717e62434101c4d72f1a31ef39a
+	b10bb6b2382f995ee90f9cc807b69cb336d0edb65096b66df315f0c60132e04d
+	e28d79fcb808d7c275938a4d9871da3138fdd38eb7c1c69495bf9a9d36dc271a)
+
+
+
+# extracts a debian package
+# $1: deb file to extract
+extract_deb() {
+	local tmpdir="$(basename "${1%.deb}")"
+	rm -Rf "$tmpdir"
+	mkdir "$tmpdir"
+	cd "$tmpdir"
+	ar x "$1"
+	tar -C "${pkgdir}" -xf data.tar.xz
+}
+# move ubuntu specific /usr/lib/x86_64-linux-gnu to /usr/lib
+# $1: library dir
+# $2: destination (optional)
+move_libdir() {
+	local libdir="usr/lib"
+	if [ -n "$2" ]; then
+		libdir="$2"
+	fi
+	if [ -d "$1" ]; then
+		if [ -d "${pkgdir}/${libdir}" ]; then
+			cp -ar -t "${pkgdir}/${libdir}/" "$1"/*
+			rm -rf "$1"
+		else
+			mkdir -p "${pkgdir}/${libdir}"
+			mv -t "${pkgdir}/${libdir}/" "$1"/*
+			rmdir "$1"
+		fi
 	fi
 }
 
 
-package_amdgpu-pro-core () {
-	pkgdesc="This package switchs the GPU stack to amdgpu-pro with basic components."
-	depends=('linux-firmware' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-core_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-core_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/lib ${pkgdir}/usr/
-	sed -i 's/\/usr\/lib\/x86_64-linux-gnu\//\/usr\/lib\//' ${pkgdir}/usr/lib/amdgpu-pro/ld.conf
-	sed -i 's/\/usr\/lib\/i386-linux-gnu\//\/usr\/lib32\//' ${pkgdir}/usr/lib/amdgpu-pro/ld.conf
-	mkdir -p ${pkgdir}/etc/ld.so.conf.d/
-	ln -s /usr/lib/amdgpu-pro/ld.conf ${pkgdir}/etc/ld.so.conf.d/10-amdgpu-pro.conf
-	mkdir -p ${pkgdir}/etc/modprobe.d/
-	ln -s /usr/lib/amdgpu-pro/modprobe.conf ${pkgdir}/etc/modprobe.d/amdgpu-pro.conf
+package_amdgpu-pro () {
+	pkgdesc="The AMDGPU Pro driver package"
 	install=amdgpu-pro-core.install
-
+	arch=('x86_64')
+	depends=('glib2>=2.37.3' 'gst-plugins-base>=1.6.0' 'gstreamer>=1.0.0' 'lib32-amdgpu-pro-libdrm=16.60.379184-1' 'lib32-amdgpu-pro-opencl=16.60.379184-1' 'lib32-amdgpu-pro-vdpau=16.60.379184-1' 'lib32-amdgpu-pro-vulkan=16.60.379184-1' 'lib32-amdgpu-pro=16.60.379184-1' 'libomxil-bellagio' 'libx11' 'libx11>=1.4.99.1' 'libxcb' 'libxcb>=1.8' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm' 'ncurses5-compat-libs>=6' 'openssl>=1.0.0' 'xf86-video-amdgpu-pro=16.60.379184-1' 'zlib>=1.2.0')
+
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro-lib32_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./gst-omx-amdgpu-pro_1.0.0.1-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libegl1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-base_16.60-379184_all.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-dev_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-appprofiles_16.60-379184_all.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-dri_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-ext_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-glx_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libglamor-amdgpu-pro-dev_1.18.3-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgles2-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./mesa-amdgpu-pro-omx-drivers_12.0.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
+
+	# extra_commands:
+	mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/dri ${pkgdir}/usr/lib/
+	# This is needed because libglx.so has a hardcoded DRI_DRIVER_PATH
+	ln -s /usr/lib/dri ${pkgdir}/usr/lib/x86_64-linux-gnu/dri
+	mkdir -p "${pkgdir}/etc/ld.so.conf.d/"
+	echo "/opt/amdgpu-pro/lib/x86_64-linux-gnu/" > "${pkgdir}"/etc/ld.so.conf.d/amdgpu-pro.conf
 }
 
 
 package_amdgpu-pro-dkms () {
 	pkgdesc="amdgpu-pro driver in DKMS format."
-	depends=('dkms>=1.95')
 	arch=('any')
+	depends=('dkms>=1.95')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	mkdir "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	cd "${srcdir}"/amdgpu-pro-dkms_16.30.3-315407_all
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-dkms_16.30.3-315407_all.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro-dkms_16.60-379184_all.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-	(cd ${pkgdir}/usr/src/amdgpu-pro-16.30.3-315407;
+	# extra_commands:
+	msg 'Applying patches...'
+	(cd ${pkgdir}/usr/src/amdgpu-pro-16.60-379184;
 		sed -i 's/\/extra/\/extramodules/' dkms.conf
-		patch -p1 -i "${srcdir}/0001-add-OS-detection-for-arch.patch";
-		patch -p1 -i "${srcdir}/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch";
-		patch -p1 -i "${srcdir}/0003-add-kcl_drm_gem_object_lookup.patch";
-		patch -p1 -i "${srcdir}/0004-paging-changes-for-linux-4.6.patch";
-		patch -p1 -i "${srcdir}/0005-LRU-stuff-isn-t-available-until-4.7.x.patch";
-		patch -p1 -i "${srcdir}/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch";
-		patch -p1 -i "${srcdir}/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch";
-		patch -p1 -i "${srcdir}/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch";
-		patch -p1 -i "${srcdir}/0009-disable-dal-by-default.patch";
-		patch -p1 -i "${srcdir}/0010-remove-dependency-on-System.map.patch")
-
+			msg2 '0001-add-archlinux-as-build-option.patch'
+		patch -p1 -i "${srcdir}/0001-add-archlinux-as-build-option.patch";
+		msg2 '0002-fix_get_user_pages_calls.patch'
+		patch -p1 -i "${srcdir}/0002-fix_get_user_pages_calls.patch";
+		msg2 '0003-fix_drm_connector.patch'
+		patch -p1 -i "${srcdir}/0003-fix_drm_connector.patch";
+		msg2 '0004-Change-seq_printf-format-for-64-bit-context.patch'
+		patch -p1 -i "${srcdir}/0004-Change-seq_printf-format-for-64-bit-context.patch";
+		msg2 '0005-fix_drm_vma_node_verify_access.patch'
+		patch -p1 -i "${srcdir}/0005-fix_drm_vma_node_verify_access.patch";
+		msg2 '0006-fix_dm_plane_helper_funcs.patch'
+		patch -p1 -i "${srcdir}/0006-fix_dm_plane_helper_funcs.patch";
+		msg2 '0007-disable-dal-by-default.patch'
+		patch -p1 -i "${srcdir}/0007-disable-dal-by-default.patch"
+	)
 }
 
 
-package_amdgpu-pro-firmware () {
-	pkgdesc="Firmware for amdgpu-pro cards."
-	depends=()
+package_amdgpu-pro-libdrm () {
+	pkgdesc="The AMDGPU Pro userspace interface to kernel DRM services"
 	arch=('x86_64')
+	provides=('libdrm')
+	conflicts=('libdrm')
+	depends=('bcunit')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-firmware_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-firmware_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/lib ${pkgdir}/usr/
-	mv ${pkgdir}/usr/lib/firmware ${pkgdir}/usr/lib/firmware.tmp
-	mkdir -p ${pkgdir}/usr/lib/firmware
-	mv ${pkgdir}/usr/lib/firmware.tmp ${pkgdir}/usr/lib/firmware/updates
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-amdgpu1_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-dev_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-radeon1_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-utils_2.4.70-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm2-amdgpu-pro_2.4.70-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
 }
 
 
-package_amdgpu-pro-graphics () {
-	pkgdesc="This package install amdgpu-pro graphics components."
-	depends=('amdgpu-pro-core=16.30.3.315407-2' 'libgles2-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'xserver-xorg-video-amdgpu-pro=16.30.3.315407-2' 'amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'libvdpau-amdgpu-pro=16.30.3.315407-2')
+package_amdgpu-pro-libgl () {
+	pkgdesc="The AMDGPU Pro libgl library symlinks"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-graphics_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-graphics_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
 	provides=('libgl')
 	conflicts=('libgl')
+	depends=(amdgpu-pro)
 
-}
-
-
-package_lib32-amdgpu-pro-lib32 () {
-	pkgdesc="This package contains x86 libs for x86_64 machine usage."
-	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dev=16.30.3.315407-2' 'lib32-libgl1-amdgpu-pro-dri=16.30.3.315407-2' 'lib32-libgbm1-amdgpu-pro=16.30.3.315407-2' 'lib32-amdgpu-pro-opencl-icd=16.30.3.315407-2' 'lib32-amdgpu-pro-libopencl-dev=16.30.3.315407-2' 'lib32-amdgpu-pro-vulkan-driver=16.30.3.315407-2' 'lib32-libvdpau-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-lib32_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-lib32_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	provides=('lib32-libgl')
-	conflicts=('lib32-libgl')
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-amdgpu-pro-libopencl-dev () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=('lib32-amdgpu-pro-libopencl1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	provides=(lib32-libcl)
-	conflicts=(lib32-libcl)
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_amdgpu-pro-libopencl-dev () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=('amdgpu-pro-libopencl1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	provides=(libcl)
-	conflicts=(libcl)
-
-}
-
-
-package_amdgpu-pro-libopencl1 () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=()
-	arch=('x86_64')
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 }
 
 
-package_lib32-amdgpu-pro-libopencl1 () {
-	pkgdesc="AMD OpenCL ICD Loader library"
-	depends=()
+package_amdgpu-pro-opencl () {
+	pkgdesc="The AMDGPU Pro OpenCL implementation"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-libopencl1_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-libopencl1_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_amdgpu-pro-opencl-icd () {
-	pkgdesc="non-free AMD OpenCL ICD Loaders"
+	provides=('opencl-driver')
 	depends=()
-	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./clinfo-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libopencl1-amdgpu-pro_16.60-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./opencl-amdgpu-pro-icd_16.60-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 }
 
 
-package_lib32-amdgpu-pro-opencl-icd () {
-	pkgdesc="non-free AMD OpenCL ICD Loaders"
-	depends=()
+package_amdgpu-pro-vdpau () {
+	pkgdesc="The AMDGPU Pro VDPAU driver"
 	arch=('x86_64')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'libvdpau>=1.1' 'libxcb' 'libxcb>=1.8' 'ncurses5-compat-libs>=6' 'openssl>=1.0.0' 'zlib>=1.2.0')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-opencl-icd_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-opencl-icd_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libvdpau-amdgpu-pro_12.0.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib/
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so.1.0.0
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so.1
+	ln -s /opt/amdgpu-pro/lib/x86_64-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib/libvdpau_amdgpu.so
 }
 
 
-package_amdgpu-pro-vulkan-driver () {
-	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
+package_amdgpu-pro-vulkan () {
+	pkgdesc="The AMDGPU Pro Vulkan driver"
 	arch=('x86_64')
+	provides=('vulkan-driver')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	sed -i 's/\/usr\/lib\/x86_64-linux-gnu\//\/usr\/lib\//' ${pkgdir}/etc/vulkan/icd.d/amd_icd64.json
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./vulkan-amdgpu-pro_16.60-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+	mv "${pkgdir}"/etc/vulkan/icd.d/amd_icd64.json "${pkgdir}"/usr/share/vulkan/icd.d/
+	rm -rf "${pkgdir}"/etc/vulkan/
 }
 
 
-package_lib32-amdgpu-pro-vulkan-driver () {
-	pkgdesc="AMDGPU Pro Vulkan driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
+package_lib32-amdgpu-pro () {
+	pkgdesc="Meta package to install amdgpu Pro components. (32bit libraries)"
 	arch=('x86_64')
+	depends=('amdgpu-pro-dkms=16.60.379184-1' 'amdgpu-pro-libdrm=16.60.379184-1' 'amdgpu-pro-opencl=16.60.379184-1' 'amdgpu-pro-vdpau=16.60.379184-1' 'amdgpu-pro-vulkan=16.60.379184-1' 'amdgpu-pro=16.60.379184-1' 'lib32-glib2>=2.37.3' 'lib32-gst-plugins-base>=1.6.0' 'lib32-gstreamer>=1.0.0' 'lib32-libomxil-bellagio' 'lib32-libx11' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb' 'lib32-libxcb>=1.8' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-ncurses5-compat-libs>=6' 'lib32-openssl>=1.0.0' 'lib32-zlib>=1.2.0' 'xf86-video-amdgpu-pro=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	mkdir "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	cd "${srcdir}"/amdgpu-pro-vulkan-driver_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./amdgpu-pro-vulkan-driver_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./gst-omx-amdgpu-pro_1.0.0.1-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libegl1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgbm1-amdgpu-pro-dev_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-dri_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-ext_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgl1-amdgpu-pro-glx_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libglamor-amdgpu-pro-dev_1.18.3-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libgles2-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./mesa-amdgpu-pro-omx-drivers_12.0.3-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib32/
+	mv "${pkgdir}"/usr/lib/i386-linux-gnu/dri "${pkgdir}"/usr/lib32/
+	rm -rf "${pkgdir}"/etc
+	mkdir -p "${pkgdir}/etc/ld.so.conf.d/"
+	echo "/opt/amdgpu-pro/lib/i386-linux-gnu/" > "${pkgdir}"/etc/ld.so.conf.d/lib32-amdgpu-pro.conf
 
-	sed -i 's/\/usr\/lib\/i386-linux-gnu\//\/usr\/lib32\//' ${pkgdir}/etc/vulkan/icd.d/amd_icd32.json
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libdrm-amdgpu-pro-amdgpu1 () {
-	pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2')
+package_lib32-amdgpu-pro-libdrm () {
+	pkgdesc="The AMDGPU Pro userspace interface to kernel DRM services (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-libdrm')
+	conflicts=('lib32-libdrm')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-amdgpu1_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-dev_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm-amdgpu-pro-radeon1_2.4.70-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libdrm2-amdgpu-pro_2.4.70-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-package_lib32-libdrm-amdgpu-pro-amdgpu1 () {
-	pkgdesc="Userspace interface to amdgpu-specific kernel DRM services -- runtime"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-amdgpu1_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_lib32-libdrm-amdgpu-pro-dev () {
-	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libdrm-amdgpu-pro-dev () {
-	pkgdesc="Userspace interface to kernel DRM services -- development files"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libdrm-amdgpu-pro-tools () {
-	pkgdesc="testing tools for libdrm-amdgpu-pro"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm-amdgpu-pro-tools_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm-amdgpu-pro-tools_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libdrm2-amdgpu-pro () {
-	pkgdesc="Userspace interface to kernel DRM services -- runtime"
-	depends=()
+package_lib32-amdgpu-pro-libgl () {
+	pkgdesc="The AMDGPU Pro libgl library symlinks (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-libgl')
+	conflicts=('lib32-libgl')
+	depends=(lib32-amdgpu-pro)
 
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
 
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-package_lib32-libdrm2-amdgpu-pro () {
-	pkgdesc="Userspace interface to kernel DRM services -- runtime"
-	depends=()
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libdrm2-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libdrm2-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libegl1-amdgpu-pro () {
-	pkgdesc="implementation of the EGL API -- runtime"
-	depends=()
+package_lib32-amdgpu-pro-opencl () {
+	pkgdesc="The AMDGPU Pro OpenCL implementation"
 	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libEGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_lib32-libegl1-amdgpu-pro () {
-	pkgdesc="implementation of the EGL API -- runtime"
+	provides=('lib32-opencl-driver')
 	depends=()
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libEGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-libegl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the EGL API -- development files"
-	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libEGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libegl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the EGL API -- development files"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libegl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libegl1-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libEGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_libgbm-amdgpu-pro-dev () {
-	pkgdesc="generic buffer management API -- development files"
-	depends=('libgbm1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_lib32-libgbm-amdgpu-pro-dev () {
-	pkgdesc="generic buffer management API -- development files"
-	depends=('lib32-libgbm1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgbm-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgbm1-amdgpu-pro () {
-	pkgdesc="generic buffer management API -- runtime"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_lib32-libgbm1-amdgpu-pro () {
-	pkgdesc="generic buffer management API -- runtime"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libgbm1-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgbm1-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-libgl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('lib32-libgl1-amdgpu-pro-glx=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgl1-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL API -- GLX development files"
-	depends=('libgl1-amdgpu-pro-glx=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_lib32-libgl1-amdgpu-pro-dri () {
-	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('lib32-libx11' 'lib32-libxext')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libgl1-amdgpu-pro-dri () {
-	pkgdesc="implementation of the OpenGL API -- DRI modules"
-	depends=('libx11' 'libxext')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-dri_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-dri_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_libgl1-amdgpu-pro-glx () {
-	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('libdrm2-amdgpu-pro=16.30.3.315407-2' 'libx11>=1.4.99.1' 'libxcb>=1.8' 'libxcb' 'libxcb>=1.9.2' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxshmfence' 'libxxf86vm')
-	arch=('x86_64')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libopencl1-amdgpu-pro_16.60-379184_i386.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./opencl-amdgpu-pro-icd_16.60-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
 
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGL* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
 }
 
 
-package_lib32-libgl1-amdgpu-pro-glx () {
-	pkgdesc="implementation of the OpenGL API -- GLX runtime"
-	depends=('lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-libx11>=1.4.99.1' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-libxcb>=1.9.2' 'lib32-libxdamage>=1.1' 'lib32-libxext' 'lib32-libxfixes' 'lib32-libxshmfence' 'lib32-libxxf86vm')
+package_lib32-amdgpu-pro-vdpau () {
+	pkgdesc="The AMDGPU Pro VDPAU driver (32bit libraries)"
 	arch=('x86_64')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'lib32-libvdpau>=1.1' 'lib32-libxcb' 'lib32-libxcb>=1.8' 'lib32-ncurses5-compat-libs>=6' 'lib32-openssl>=1.0.0' 'lib32-zlib>=1.2.0')
 
-	rm -Rf "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	cd "${srcdir}"/libgl1-amdgpu-pro-glx_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgl1-amdgpu-pro-glx_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./libvdpau-amdgpu-pro_12.0.3-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/lib32/
+	ln -s /opt/amdgpu-pro/lib/i386-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so.1.0.0
+	ln -s /opt/amdgpu-pro/lib/i368-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so.1
+	ln -s /opt/amdgpu-pro/lib/i368-linux-gnu/vdpau/libvdpau_amdgpu.so.1.0.0 "${pkgdir}"/usr/lib32/libvdpau_amdgpu.so
 
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGL* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgles2-amdgpu-pro () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('libegl1-amdgpu-pro=16.30.3.315407-2')
+package_lib32-amdgpu-pro-vulkan () {
+	pkgdesc="The AMDGPU Pro Vulkan driver (32bit libraries)"
 	arch=('x86_64')
+	provides=('lib32-vulkan-driver')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./vulkan-amdgpu-pro_16.60-379184_i386.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/i386-linux-gnu" "usr/lib32"
+	move_libdir "${pkgdir}/lib" "usr/lib32"
 
+	# extra_commands:
+	mkdir -p "${pkgdir}"/usr/share/vulkan/icd.d/
+	mv "${pkgdir}"/etc/vulkan/icd.d/amd_icd32.json "${pkgdir}"/usr/share/vulkan/icd.d/
+	rm -rf "${pkgdir}"/etc/vulkan/
 
-package_lib32-libgles2-amdgpu-pro () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- runtime"
-	depends=('lib32-libegl1-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
+	# lib32 cleanup
+	rm -rf "${pkgdir}"/usr/{bin,lib,include,share} "${pkgdir}/var" "${pkgdir}"/opt/amdgpu-pro/{bin,include,share}
+	rm -rf "${pkgdir}"/opt/amdgpu-pro/lib/xorg/modules/extensions/
 
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
 }
 
 
-package_libgles2-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('libgles2-amdgpu-pro=16.30.3.315407-2')
+package_xf86-video-amdgpu-pro () {
+	pkgdesc="The AMDGPU Pro X.org video driver"
 	arch=('x86_64')
+	provides=('xf86-video-amdgpu')
+	conflicts=('xf86-video-amdgpu' 'xorg-server<1.18.0' 'xorg-server>=1.19.0X-ABI-VIDEODRV_VERSION<20' 'X-ABI-VIDEODRV_VERSION>=21')
+	groups=('xorg-driversxorg')
+	depends=('amdgpu-pro-libdrm=16.60.379184-1' 'amdgpu-pro=16.60.379184-1' 'libepoxy>=1.0' 'libsystemd>=183')
 
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib/amdgpu-pro/libGLES* ${pkgdir}/usr/lib
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
-
-}
-
-
-package_lib32-libgles2-amdgpu-pro-dev () {
-	pkgdesc="implementation of the OpenGL|ES 2.x API -- development files"
-	depends=('lib32-libgles2-amdgpu-pro=16.30.3.315407-2')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	mkdir "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	cd "${srcdir}"/libgles2-amdgpu-pro-dev_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libgles2-amdgpu-pro-dev_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-
-	mv ${pkgdir}/usr/lib32/amdgpu-pro/libGLES* ${pkgdir}/usr/lib32
-	rm -r ${pkgdir}/usr/lib32/amdgpu-pro
-
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_lib32-libvdpau-amdgpu-pro () {
-	pkgdesc="AMDGPU Pro VDPAU driver"
-	depends=('lib32-libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'lib32-libdrm>=2.4.31' 'lib32-libdrm2-amdgpu-pro=16.30.3.315407-2' 'lib32-openssl>=1.0.0' 'lib32-libx11' 'lib32-libxcb>=1.8' 'lib32-libxcb' 'lib32-zlib>=1.2.0')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_i386
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-315407_i386.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/i386-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib32
-		mv "${pkgdir}"/usr/lib/i386-linux-gnu/* "${pkgdir}"/usr/lib32
-		rmdir "${pkgdir}"/usr/lib/i386-linux-gnu
-	fi
-	rm -Rf ${pkgdir}/usr/share/doc ${pkgdir}/usr/include
-}
-
-
-package_libvdpau-amdgpu-pro () {
-	pkgdesc="AMDGPU Pro VDPAU driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm>=2.4.31' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'openssl>=1.0.0' 'libx11' 'libxcb>=1.8' 'libxcb')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/libvdpau-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./libvdpau-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-}
-
-
-package_xserver-xorg-video-amdgpu-pro () {
-	pkgdesc="X.Org X server -- AMD/ATI Amdgpu-Pro display driver"
-	depends=('libdrm-amdgpu-pro-amdgpu1=16.30.3.315407-2' 'libdrm2-amdgpu-pro=16.30.3.315407-2' 'libepoxy>=1.0' 'libgbm1-amdgpu-pro=16.30.3.315407-2' 'libgl1-amdgpu-pro-glx=16.30.3.315407-2' 'libsystemd>=183' 'libx11' 'libxcb' 'libxdamage>=1.1' 'libxext' 'libxfixes' 'libxxf86vm' 'xorg-server')
-	arch=('x86_64')
-
-	rm -Rf "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
-	mkdir "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
-	cd "${srcdir}"/xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64
-	ar x "${srcdir}"/amdgpu-pro-driver/./xserver-xorg-video-amdgpu-pro_16.30.3-315407_amd64.deb
-	tar -C "${pkgdir}" -xf data.tar.xz
-
-	if [ -d "${pkgdir}/usr/lib/x86_64-linux-gnu" ]; then
-		mkdir -p "${pkgdir}"/usr/lib
-		mv "${pkgdir}"/usr/lib/x86_64-linux-gnu/* "${pkgdir}"/usr/lib
-		rmdir "${pkgdir}"/usr/lib/x86_64-linux-gnu
-	fi
-
-	conflicts=('xf86-video-amdgpu')
-	mkdir -p ${pkgdir}/usr/lib/x86_64-linux-gnu
-	# This is needed because libglx.so has a hardcoded DRI_DRIVER_PATH
-	ln -s /usr/lib/dri ${pkgdir}/usr/lib/x86_64-linux-gnu/dri
-	mv ${pkgdir}/usr/lib/amdgpu-pro/1.18/ ${pkgdir}/usr/lib/xorg
-	rm -r ${pkgdir}/usr/lib/amdgpu-pro
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-amdgpu-pro_1.2.99-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-glamoregl-amdgpu-pro_1.18.3-379184_amd64.deb
+	extract_deb "${srcdir}"/amdgpu-pro-16.60-379184/./xserver-xorg-video-modesetting-amdgpu-pro_1.18.3-379184_amd64.deb
+	#move_libdir "${pkgdir}/opt/amdgpu-pro" "usr"
+	#move_libdir "${pkgdir}/opt/amdgpu-pro/lib/x86_64-linux-gnu"
+	move_libdir "${pkgdir}/lib"
 
 }
author	David McFarland	2017-02-07 08:11:35 -0400
committer	David McFarland	2017-02-07 08:11:35 -0400
commit	2a51bcdea913f0f5f952b3d0254aca4846de8a36 (patch)
tree	aabf174ee04afd42425504636399354b1ca95b30 /PKGBUILD
parent	22ed57d1112fe758eb8f637246b6342687031dbf (diff)
download	aur-2a51bcdea913f0f5f952b3d0254aca4846de8a36.tar.gz