diff -u libpciaccess-0.12.902/debian/changelog libpciaccess-0.12.902/debian/changelog --- libpciaccess-0.12.902/debian/changelog +++ libpciaccess-0.12.902/debian/changelog @@ -1,3 +1,11 @@ +libpciaccess (0.12.902-1ubuntu0.1) precise-proposed; urgency=low + + * Enable patch system in package build + * Add libpciaccess-dev-port.patch, backport from upstream git to fix + x-x-v-vesa usage in virtualbox. (LP: #1122072) + + -- Robert Hooker Tue, 12 Feb 2013 11:50:52 -0500 + libpciaccess (0.12.902-1) unstable; urgency=low * New upstream release candidate. diff -u libpciaccess-0.12.902/debian/control libpciaccess-0.12.902/debian/control --- libpciaccess-0.12.902/debian/control +++ libpciaccess-0.12.902/debian/control @@ -1,7 +1,8 @@ Source: libpciaccess Section: devel Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: David Nusinow , Cyril Brulebois Build-Depends: debhelper (>= 8.1.3), @@ -11,6 +12,7 @@ xutils-dev (>= 1:7.5), pkg-config, dh-autoreconf, + quilt Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libpciaccess Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libpciaccess.git diff -u libpciaccess-0.12.902/debian/rules libpciaccess-0.12.902/debian/rules --- libpciaccess-0.12.902/debian/rules +++ libpciaccess-0.12.902/debian/rules @@ -5,7 +5,7 @@ CFLAGS = $(shell dpkg-buildflags --get CFLAGS) %: - dh $@ --with autoreconf --builddirectory=build/ --parallel + dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel override_dh_auto_configure: dh_auto_configure -- \ only in patch2: unchanged: --- libpciaccess-0.12.902.orig/debian/patches/libpciaccess-dev-port.patch +++ libpciaccess-0.12.902/debian/patches/libpciaccess-dev-port.patch @@ -0,0 +1,143 @@ +diff -up libpciaccess-0.12.902/src/linux_sysfs.c.jx libpciaccess-0.12.902/src/linux_sysfs.c +--- libpciaccess-0.12.902/src/linux_sysfs.c.jx 2012-02-07 11:48:09.699318237 -0500 ++++ libpciaccess-0.12.902/src/linux_sysfs.c 2012-02-08 13:37:19.341169509 -0500 +@@ -1,6 +1,7 @@ + /* + * (C) Copyright IBM Corporation 2006 + * All Rights Reserved. ++ * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), +@@ -44,6 +45,18 @@ + #include + #include + ++#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) ++#include ++#else ++#define inb(x) -1 ++#define inw(x) -1 ++#define inl(x) -1 ++#define outb(x,y) do {} while (0) ++#define outw(x,y) do {} while (0) ++#define outl(x,y) do {} while (0) ++#define iopl(x) -1 ++#endif ++ + #include "config.h" + + #ifdef HAVE_MTRR +@@ -775,19 +788,24 @@ pci_device_linux_sysfs_open_legacy_io(st + snprintf(name, PATH_MAX, "/sys/class/pci_bus/%04x:%02x/legacy_io", + dev->domain, dev->bus); + +- ret->fd = open(name, O_RDWR); ++ ret->fd = open(name, O_RDWR | O_CLOEXEC); + if (ret->fd >= 0) + break; + + dev = pci_device_get_parent_bridge(dev); + } + +- /* If not, /dev/port is the best we can do */ +- if (!dev) +- ret->fd = open("/dev/port", O_RDWR); ++ /* ++ * You would think you'd want to use /dev/port here. Don't make that ++ * mistake, /dev/port only does byte-wide i/o cycles which means it ++ * doesn't work. If you think this is stupid, well, you're right. ++ */ + +- if (ret->fd < 0) +- return NULL; ++ /* If we've no other choice, iopl */ ++ if (ret->fd < 0) { ++ if (iopl(3)) ++ return NULL; ++ } + + ret->base = base; + ret->size = size; +@@ -799,7 +817,8 @@ static void + pci_device_linux_sysfs_close_io(struct pci_device *dev, + struct pci_io_handle *handle) + { +- close(handle->fd); ++ if (handle->fd > -1) ++ close(handle->fd); + } + + static uint32_t +@@ -807,8 +826,11 @@ pci_device_linux_sysfs_read32(struct pci + { + uint32_t ret; + +- pread(handle->fd, &ret, 4, port + handle->base); +- ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 4, port + handle->base); ++ else ++ ret = inl(port + handle->base); ++ + return ret; + } + +@@ -817,7 +839,10 @@ pci_device_linux_sysfs_read16(struct pci + { + uint16_t ret; + +- pread(handle->fd, &ret, 2, port + handle->base); ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 2, port + handle->base); ++ else ++ ret = inw(port + handle->base); + + return ret; + } +@@ -827,7 +852,10 @@ pci_device_linux_sysfs_read8(struct pci_ + { + uint8_t ret; + +- pread(handle->fd, &ret, 1, port + handle->base); ++ if (handle->fd > -1) ++ pread(handle->fd, &ret, 1, port + handle->base); ++ else ++ ret = inb(port + handle->base); + + return ret; + } +@@ -836,21 +864,30 @@ static void + pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port, + uint32_t data) + { +- pwrite(handle->fd, &data, 4, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 4, port + handle->base); ++ else ++ outl(data, port + handle->base); + } + + static void + pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port, + uint16_t data) + { +- pwrite(handle->fd, &data, 2, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 2, port + handle->base); ++ else ++ outw(data, port + handle->base); + } + + static void + pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port, + uint8_t data) + { +- pwrite(handle->fd, &data, 1, port + handle->base); ++ if (handle->fd > -1) ++ pwrite(handle->fd, &data, 1, port + handle->base); ++ else ++ outb(data, port + handle->base); + } + + static int only in patch2: unchanged: --- libpciaccess-0.12.902.orig/debian/patches/series +++ libpciaccess-0.12.902/debian/patches/series @@ -0,0 +1 @@ +libpciaccess-dev-port.patch