Summary
Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40
Recent Commits
>
--git a/Ubuntu/dists/intrepid/control b/Ubuntu/dists/intrepid/control
index 657995f..fd0c8b8 100644
--- a/Ubuntu/dists/intrepid/control
+++ b/Ubuntu/dists/intrepid/control
@@ -13,8 +13,6 @@ Build-Depends: debhelper (>= 5),
libxi6,
libxcursor1,
fakeroot,
- ia32-libs [amd64],
- libstdc++5,
libdrm2,
libgl1-mesa-glx
Standards-Version: 3.8.0
@@ -22,8 +20,8 @@ Homepage: http://ati.amd.com/support/driver.html
Package: xorg-driver-fglrx
Architecture: amd64 i386
-Recommends: fglrx-amdcccle
-Depends: ${shlibs:Depends}, xserver-xorg-core, fglrx-kernel-source
+Recommends: fglrx-amdcccle, libamdxvba1
+Depends: ${shlibs:Depends}, xserver-xorg-core, fglrx-kernel-source, ia32-libs [amd64]
Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy, nvidia-glx-new, nvidia-glx-71, nvidia-glx-96, nvidia-glx-173, nvidia-glx-177
Replaces: fglrx-driver, xfree86-driver-fglrx
Description: Video driver for the ATI graphics accelerators
@@ -82,3 +80,14 @@ Description: Identifiers supported by the ATI graphics driver
archive supports.
.
This package provides that list.
+
+Package: libamdxvba1
+Architecture: amd64 i386
+Depends: ${shlibs:Depends}, libc6, libstdc++5
+Replaces: xorg-driver-fglrx (<= 2:8.543-0ubuntu2)
+Description: AMD Unified Video Decoder library
+ This package provides the support for the AMD unified video
+ decoder library. This can be used for accelerated XvMC output.
+ .
+ Unfortunately, this package requires an unsupported library,
+ so it is not installed by default.
diff --git a/Ubuntu/dists/intrepid/libamdxvba1.install.in b/Ubuntu/dists/intrepid/libamdxvba1.install.in
new file mode 100644
index 0000000..2231fe1
--- /dev/null
+++ b/Ubuntu/dists/intrepid/libamdxvba1.install.in
@@ -0,0 +1,3 @@
+#DRI stuff
+arch/#ARCH#/usr/X11R6/#LIBDIR#/libAMD*.so* usr/lib
+
diff --git a/Ubuntu/dists/intrepid/libamdxvba1.postinst b/Ubuntu/dists/intrepid/libamdxvba1.postinst
new file mode 100644
index 0000000..bf1f031
--- /dev/null
+++ b/Ubuntu/dists/intrepid/libamdxvba1.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
diff --git a/Ubuntu/dists/intrepid/rules b/Ubuntu/dists/intrepid/rules
index f371f7e..3b3fc8a 100755
--- a/Ubuntu/dists/intrepid/rules
+++ b/Ubuntu/dists/intrepid/rules
@@ -35,6 +35,16 @@ PKG_driver := xorg-driver-fglrx
PKG_driver_dev := xorg-driver-fglrx-dev
PKG_kernel_src := fglrx-kernel-source
PKG_control := fglrx-amdcccle
+PKG_UVD_library := libamdxvba1
+
+
+# Unfortunately, we won't have libstdc++5 at build time
+# Also, we can't go and use debian/shlibs.local. It requires
+# that you have the library installed, and that library
+# just forgot to ship a shlibs file.
+# See (LP: #271794) for more information
+DEB_DH_SHLIBDEPS_ARGS_ALL="-Xlib32"
+DEB_DH_SHLIBDEPS_ARGS_$(PKG_UVD_library)="-XlibAMD"
configure/$(PKG_driver)::
@@ -45,6 +55,7 @@ configure/$(PKG_driver)::
$(PKG_driver_dev).install
$(PKG_kernel_src).install
$(PKG_control).install
+ $(PKG_UVD_library).install
overrides/$(PKG_kernel_src); do
sed -e "s|#XMODDIR#|$(XMODDIR)|"
-e "s|#XMODDIR32#|$(XMODDIR32)|"
@@ -85,15 +96,22 @@ clean::
$(PKG_driver_dev).install,
$(PKG_kernel_src).install,
$(PKG_control).install,
+ $(PKG_UVD_library).install
overrides/$(PKG_kernel_src),
modaliases/fglrx-modules.alias.override}
+binary-install/$(PKG_UVD_library)::
+ifeq ($(DEB_BUILD_ARCH),amd64)
+ dh_install -p$(PKG_UVD_library) "arch/x86/usr/X11R6/lib/libAMD*.so*" "usr/lib32"
+endif
+
binary-install/$(PKG_driver)::
ifeq ($(DEB_BUILD_ARCH),amd64)
#driver package
dh_install -p$(PKG_driver) "arch/x86/usr/X11R6/lib/*.so*" "usr/lib32"
dh_install -p$(PKG_driver) "arch/x86/usr/X11R6/lib/modules/dri" "$(DRIDIR32)"
dh_installdirs -p$(PKG_driver) "usr/lib32/fglrx"
+
endif
dh_installdocs -p$(PKG_driver) usr/share/doc/fglrx/* --exclude ATI_LICENSE.TXT
diff --git a/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in b/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
index f2c45dc..63d0a16 100644
--- a/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
+++ b/Ubuntu/dists/intrepid/xorg-driver-fglrx.install.in
@@ -11,7 +11,10 @@ arch/#ARCH#/usr/X11R6/bin/fgl* usr/bin
usr/sbin/*sh usr/share/fglrx
#DRI stuff
-arch/#ARCH#/usr/X11R6/#LIBDIR#/*.so* usr/lib
+arch/#ARCH#/usr/X11R6/#LIBDIR#/liba*.so* usr/lib
+arch/#ARCH#/usr/X11R6/#LIBDIR#/libf*.so* usr/lib
+arch/#ARCH#/usr/X11R6/#LIBDIR#/libX*.so* usr/lib
+arch/#ARCH#/usr/X11R6/#LIBDIR#/libG*.so* usr/lib
arch/#ARCH#/usr/X11R6/#LIBDIR#/modules/dri #DRIDIR#
&n
Copyright © 2010 by Phoronix Media