Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cdda054a74cd439cea65b316b1981e00a977d989)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cdda054a74cd439cea65b316b1981e00a977d989)
  • Date: Sat, 16 Jun 2012 09:37:38 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/libusb-compat/HISTORY | 4 ++++
libs/libusb-compat/PRE_BUILD | 6 ++++++
libs/libusbx/DETAILS | 4 ++--
libs/libusbx/HISTORY | 3 +++
4 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit cdda054a74cd439cea65b316b1981e00a977d989
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libusbx: => 1.0.12

commit 5c73339c8c0474c57eb0c747b48e207fde62cad5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libusb-compat - fix build with latest libusbx

diff --git a/libs/libusb-compat/HISTORY b/libs/libusb-compat/HISTORY
index e269556..5223ab8 100644
--- a/libs/libusb-compat/HISTORY
+++ b/libs/libusb-compat/HISTORY
@@ -1,3 +1,7 @@
+2012-06-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: added
+ libusbx now defines usbi_log_level, so remove it
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

diff --git a/libs/libusb-compat/PRE_BUILD b/libs/libusb-compat/PRE_BUILD
new file mode 100755
index 0000000..c387a63
--- /dev/null
+++ b/libs/libusb-compat/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# libusbx now defines usbi_log_level
+if is_depends_enabled $SPELL libusbx;then
+ sed -i '/usbi_log_level/,/};/d' libusb/core.c
+fi
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
index 71bc0e6..4cef0c3 100755
--- a/libs/libusbx/DETAILS
+++ b/libs/libusbx/DETAILS
@@ -1,6 +1,6 @@
SPELL=libusbx
- VERSION=1.0.11
-
SOURCE_HASH=sha512:73b1f8592e80f79f5dfd3588a84ef94bf3f76e74b3027e9c455d5bc7fb99276998514c587505b19116ed22d5c1973ba0943daef723e8360c99befe583fa688fc
+ VERSION=1.0.12
+
SOURCE_HASH=sha512:61064373760d8eca3e6b0a0835d5323ba494587dc407dd743d0cdfd96922cd659bb0692a0c2793943dcc94ddda27cca0a946f2f5bacba72b64b742c88563236d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
index a7366fb..a82e7a4 100644
--- a/libs/libusbx/HISTORY
+++ b/libs/libusbx/HISTORY
@@ -1,3 +1,6 @@
+2012-06-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 1.0.12
+
2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: fix url for libusb-compat




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (cdda054a74cd439cea65b316b1981e00a977d989), Treeve Jelbert, 06/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page