summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--colord/.footprint.i6863
-rw-r--r--colord/.footprint.x86_643
-rw-r--r--libusb-compat/.md5sum.i6863
-rw-r--r--libusb-compat/.md5sum.x86_643
-rwxr-xr-xlibusb-compat/Pkgfile20
-rw-r--r--libusb-compat/libusb-0.1-libusbx.patch17
6 files changed, 35 insertions, 14 deletions
diff --git a/colord/.footprint.i686 b/colord/.footprint.i686
index 1fc3bce79..787d6d740 100644
--- a/colord/.footprint.i686
+++ b/colord/.footprint.i686
@@ -67,6 +67,9 @@ lrwxrwxrwx root/root usr/lib/libcolord.so.1 -> libcolord.so.1.0.11
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/colord-gtk.pc
-rw-r--r-- root/root usr/lib/pkgconfig/colord.pc
+drwxr-xr-x root/root usr/lib/systemd/
+drwxr-xr-x root/root usr/lib/systemd/system/
+-rw-r--r-- root/root usr/lib/systemd/system/colord.service
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/color/
drwxr-xr-x root/root usr/share/color/icc/
diff --git a/colord/.footprint.x86_64 b/colord/.footprint.x86_64
index 1fc3bce79..787d6d740 100644
--- a/colord/.footprint.x86_64
+++ b/colord/.footprint.x86_64
@@ -67,6 +67,9 @@ lrwxrwxrwx root/root usr/lib/libcolord.so.1 -> libcolord.so.1.0.11
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/colord-gtk.pc
-rw-r--r-- root/root usr/lib/pkgconfig/colord.pc
+drwxr-xr-x root/root usr/lib/systemd/
+drwxr-xr-x root/root usr/lib/systemd/system/
+-rw-r--r-- root/root usr/lib/systemd/system/colord.service
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/color/
drwxr-xr-x root/root usr/share/color/icc/
diff --git a/libusb-compat/.md5sum.i686 b/libusb-compat/.md5sum.i686
index 59c34f692..98303c88d 100644
--- a/libusb-compat/.md5sum.i686
+++ b/libusb-compat/.md5sum.i686
@@ -1 +1,2 @@
-570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2
+f941554123d2075f9bb89d80a9c33c97 libusb-0.1-libusbx.patch
+2ca521fffadd0c28fdf174e6ec73865b libusb-compat-0.1.4.tar.bz2
diff --git a/libusb-compat/.md5sum.x86_64 b/libusb-compat/.md5sum.x86_64
index 59c34f692..98303c88d 100644
--- a/libusb-compat/.md5sum.x86_64
+++ b/libusb-compat/.md5sum.x86_64
@@ -1 +1,2 @@
-570ac2ea085b80d1f74ddc7c6a93c0eb libusb-compat-0.1.3.tar.bz2
+f941554123d2075f9bb89d80a9c33c97 libusb-0.1-libusbx.patch
+2ca521fffadd0c28fdf174e6ec73865b libusb-compat-0.1.4.tar.bz2
diff --git a/libusb-compat/Pkgfile b/libusb-compat/Pkgfile
index cf09f67c2..1943cb918 100755
--- a/libusb-compat/Pkgfile
+++ b/libusb-compat/Pkgfile
@@ -6,19 +6,15 @@
# Run on: libusbx
name=libusb-compat
-version=0.1.3
+version=0.1.4
release=1
-source=( http://sourceforge.net/projects/libusb/files/$name-0.1/$name-$version/$name-$version.tar.bz2)
-
-
+source=(http://sourceforge.net/projects/libusb/files/$name-0.1/$name-$version/$name-$version.tar.bz2
+ libusb-0.1-libusbx.patch)
build() {
- # build package
- cd $name-$version
- ./configure --prefix=/usr\
- --disable-build-docs\
- --mandir=/usr/share/man\
- --infodir=/usr/share/info
- make
- make DESTDIR=$PKG install
+ cd $name-$version
+ patch -p0 < ../libusb-0.1-libusbx.patch
+ ./configure --prefix=/usr
+ make
+ make DESTDIR=$PKG install
}
diff --git a/libusb-compat/libusb-0.1-libusbx.patch b/libusb-compat/libusb-0.1-libusbx.patch
new file mode 100644
index 000000000..221c6dee5
--- /dev/null
+++ b/libusb-compat/libusb-0.1-libusbx.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/423135
+
+--- libusb/core.c
++++ libusb/core.c
+@@ -32,12 +32,6 @@
+ static libusb_context *ctx = NULL;
+ static int usb_debug = 0;
+
+-enum usbi_log_level {
+- LOG_LEVEL_DEBUG,
+- LOG_LEVEL_INFO,
+- LOG_LEVEL_WARNING,
+- LOG_LEVEL_ERROR,
+-};
+
+ #ifdef ENABLE_LOGGING
+ #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt)