--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: libxvmc: please add multiarch support
- From: Andreas Beckmann <debian@abeckmann.de>
- Date: Mon, 05 Sep 2011 12:40:20 +0200
- Message-id: <20110905104020.10475.80779.reportbug@cake.ae.cs.uni-frankfurt.de>
Package: libxvmc
Version: 2:1.0.6-1
Severity: wishlist
Tags: patch
Please rebuild libxvmc with multiarch support.
Attached patch is modeled after the multiarch changes in libxv.
I'm not sure how to handle /etc/X11/XvMCConfig correctly, might have
to be moved to a separate package libxvmc-config?
Andreas
-- System Information:
Debian Release: 6.0.2
APT prefers stable
APT policy: (800, 'stable'), (700, 'testing'), (600, 'unstable'), (500, 'stable-updates'), (130, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 072c13c64562eafeff15b2c684fa056c3353d592 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <debian@abeckmann.de>
Date: Mon, 5 Sep 2011 12:28:14 +0200
Subject: [PATCH] build for multiarch
---
debian/changelog | 1 +
debian/control | 5 ++++-
debian/libxvmc-dev.install | 10 +++++-----
debian/libxvmc1.install | 4 ++--
debian/rules | 3 +++
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 844e6e7..7b9e6c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxvmc (2:1.0.6-2) UNRELEASED; urgency=low
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ * Build for multiarch.
-- Cyril Brulebois <kibi@debian.org> Mon, 04 Apr 2011 05:56:30 +0200
diff --git a/debian/control b/debian/control
index 7a1914d..9df60c2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
libx11-dev (>= 1:0.99.2),
libxext-dev (>= 1:0.99.1),
x11proto-video-dev,
@@ -21,6 +21,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git
Package: libxvmc1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 Video extension library
libXvMC provides an X Window System client interface to the
@@ -63,6 +65,7 @@ Description: X11 Video extension library (debug package)
Package: libxvmc-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}, libxvmc1 (= ${binary:Version}), libx11-dev (>= 2:1.0.0-1), libxext-dev (>= 1:1.0.0-2), x11proto-video-dev, libxv-dev
Conflicts: x11proto-video-dev (<< 2.2+cvs.20050712-1)
Replaces: x11proto-video-dev (<< 2.2+cvs.20050712-1)
diff --git a/debian/libxvmc-dev.install b/debian/libxvmc-dev.install
index a8b1a8f..ce042b1 100644
--- a/debian/libxvmc-dev.install
+++ b/debian/libxvmc-dev.install
@@ -1,7 +1,7 @@
usr/include/X11/*
-usr/lib/libXvMC.a
-usr/lib/libXvMC.so
-usr/lib/libXvMCW.a
-usr/lib/libXvMCW.so
-usr/lib/pkgconfig/xvmc.pc
+usr/lib/*/libXvMC.a
+usr/lib/*/libXvMC.so
+usr/lib/*/libXvMCW.a
+usr/lib/*/libXvMCW.so
+usr/lib/*/pkgconfig/xvmc.pc
usr/share/doc/libXvMC/* usr/share/doc/libxvmc-dev
diff --git a/debian/libxvmc1.install b/debian/libxvmc1.install
index fe81455..71856ed 100644
--- a/debian/libxvmc1.install
+++ b/debian/libxvmc1.install
@@ -1,3 +1,3 @@
-usr/lib/libXvMC.so.1*
-usr/lib/libXvMCW.so.1*
+usr/lib/*/libXvMC.so.1*
+usr/lib/*/libXvMCW.so.1*
etc/X11/XvMCConfig
diff --git a/debian/rules b/debian/rules
index 0b5ec6f..17b82d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@
# set this to the name of the main shlib's binary package
PACKAGE = libxvmc1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
@@ -40,6 +42,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--sysconfdir=/etc --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
--
1.7.2.5
--- End Message ---