From adb6f24024eb2526182d26a9ef635142777ebf6b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 22 Mar 2015 06:18:41 +0100 Subject: [PATCH] catalyst: split libs into the -libs subpkg. This avoids a circular dependency with packages depending on libGL, provided previously by "catalyst". --- common/shlibs | 2 +- srcpkgs/catalyst-libs | 1 + srcpkgs/catalyst/template | 15 +++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/catalyst-libs diff --git a/common/shlibs b/common/shlibs index 3ce8d055eea..707ba7a3e9e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -120,7 +120,7 @@ libGLESv2.so.2 libGLES-1.0_1 libGLESv2.so rpi-firmware-20150207_1 libwayland-egl.so.1 libwayland-egl-9.0.1_4 libGL.so.1 libGL-7.11_1 -libGL.so.1 catalyst-14.2_1 +libGL.so.1 catalyst-libs-14.2_1 libGL.so.1 nvidia-libs-346.47_1 libGL.so.1 nvidia304-libs-304.00_1 libGL.so.1 nvidia-stable-libs-340.46_1 diff --git a/srcpkgs/catalyst-libs b/srcpkgs/catalyst-libs new file mode 120000 index 00000000000..96a1eca0062 --- /dev/null +++ b/srcpkgs/catalyst-libs @@ -0,0 +1 @@ +catalyst \ No newline at end of file diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 947b6938e25..5837708e1da 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -4,18 +4,17 @@ _distver="14.12" pkgname=catalyst version=14.501.1003 -revision=4 +revision=5 maintainer="Juan RP " license="Propietary AMD license" homepage="http://www.amd.com" only_for_archs="i686 x86_64" hostmakedepends="unzip wget" +subpackages="${pkgname}-opencl ${pkgname}-dkms ${pkgname}-libs" depends="${pkgname}-dkms-${version}_${revision}" conflicts="nvidia>=0 xserver-abi-video>19" -provides="libGL-${version}_${revision}" -replaces="libGL>=0" -short_desc="${_desc} - Libraries and Utilities" +short_desc="${_desc} - Utilities" repository="nonfree" create_wrksrc=yes build_wrksrc="fglrx-${version}" @@ -155,3 +154,11 @@ catalyst-opencl_package() { install -m755 usr/lib${_ARCHLIB}/libamdocl*.so ${PKGDESTDIR}/usr/lib/ } } +catalyst-libs_package() { + short_desc="${_desc} - libraries" + provides="libGL-${version}_${revision}" + replaces="libGL>=0" + pkg_install() { + vmove usr/lib + } +}