[Pkg-fglrx-devel] r1262 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-08-03 17:46:00 +0000 (Sat, 03 Aug 2013)
New Revision: 1262

Added:
   fglrx-driver/trunk/debian/amd-libopencl1.symbols
Modified:
   fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
   fglrx-driver/trunk/debian/changelog
Log:
add amd-libopencl1.symbols to generate different libopencl-{1.1,1.2}-1 dependencies

Modified: fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides	2013-08-03 17:28:50 UTC (rev 1261)
+++ fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides	2013-08-03 17:46:00 UTC (rev 1262)
@@ -2,7 +2,9 @@
 [i386]: binary-file-built-without-LFS-support
 hardening-no-fortify-functions
 hardening-no-relro
-no-symbols-control-file usr/lib*/libOpenCL.so.1
 
 # There are multiple vendors providing this library.
 package-name-doesnt-match-sonames libOpenCL1
+
+# The free libOpenCL.so.1 library is preferred.
+symbols-declares-dependency-on-other-package ocl-icd-libopencl1

Added: fglrx-driver/trunk/debian/amd-libopencl1.symbols
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.symbols	                        (rev 0)
+++ fglrx-driver/trunk/debian/amd-libopencl1.symbols	2013-08-03 17:46:00 UTC (rev 1262)
@@ -0,0 +1,19 @@
+# We use alternative dependencies:
+# * the first one (default one) is for symbols specific to this implementation
+#   There should be none
+# * the following ones are for symbols from OpenCL 1.0, 1.1 and 1.2
+#   They all provoke a dependency against two virtual packages: the "libopencl"
+#   one and and versionned virtual package "libopencl-VERSION-SOVERSION"
+#   Note: no #MINVER# is used here, so the "version" field for these dependencies
+#   is irrelevant
+#   Note bis: as OpenCL 1.0 does not really support ICD and as OpenCL 1.1 is
+#   supported by all current implementation, OpenCL 1.0 and 1.1 are merged
+#   with respect to dependencies
+libOpenCL.so.1 #PACKAGE# #MINVER#
+| ocl-icd-libopencl1 | libopencl1, libopencl-1.1-1
+| ocl-icd-libopencl1 | libopencl1, libopencl-1.2-1
+# As ocl-icd use versionned symbols, we use this information instead of
+# listing all symbols.
+ (symver|optional)OPENCL_1.0 1.0 1
+ (symver|optional)OPENCL_1.1 1.1 1
+ (symver|optional)OPENCL_1.2 1.2 2

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-08-03 17:28:50 UTC (rev 1261)
+++ fglrx-driver/trunk/debian/changelog	2013-08-03 17:46:00 UTC (rev 1262)
@@ -5,6 +5,8 @@
   * amd-opencl-dev: Provides/Conflicts/Replaces: opencl-dev.
   * amd-libopencl1: Provide virtual packages libopencl-1.1-1 and
     libopencl-1.2-1 and update description. 
+  * amd-libopencl1.symbols: New. Distinguish the neccessary dependency on
+    libopencl-{1.1,1.2}-1 via the versioned symbols being used.
   * Move the libOpenCL.so symlink from amd-libopencl1 to amd-opencl-dev and
     adjust Depends/Breaks/Replaces accordingly.
   * d/rules{,.defs}: Add support for yet another upstream file naming scheme.