Tue Aug 6 09:27:31 2019 UTC ()
libusb: revert previous patch. this code is not doing unaligned access.

PR pkg/54441


(maya)
diff -r1.44 -r1.45 pkgsrc/devel/libusb/Makefile
diff -r1.28 -r1.29 pkgsrc/devel/libusb/distinfo
diff -r1.1 -r0 pkgsrc/devel/libusb/patches/patch-descriptors.c
cvs diff -r1.44 -r1.45 pkgsrc/devel/libusb/Makefile (switch to unified diff)

--- pkgsrc/devel/libusb/Makefile 2019/08/06 09:12:10 1.44
+++ pkgsrc/devel/libusb/Makefile 2019/08/06 09:27:30 1.45
@@ -1,84 +1,84 @@ @@ -1,84 +1,84 @@
1# $NetBSD: Makefile,v 1.44 2019/08/06 09:12:10 maya Exp $ 1# $NetBSD: Makefile,v 1.45 2019/08/06 09:27:30 maya Exp $
2 2
3DISTNAME= libusb-0.1.12 3DISTNAME= libusb-0.1.12
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://libusb.sourceforge.net/ 9HOMEPAGE= http://libusb.sourceforge.net/
10COMMENT= USB access library (version 0) 10COMMENT= USB access library (version 0)
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --disable-build-docs 16CONFIGURE_ARGS+= --disable-build-docs
17PKGCONFIG_OVERRIDE+= libusb.pc.in 17PKGCONFIG_OVERRIDE+= libusb.pc.in
18 18
19# The configure script recognizes only specific OSes that have one of 19# The configure script recognizes only specific OSes that have one of
20# three USB APIs: Linux, BSD, or MacOS. If you have some other OS that 20# three USB APIs: Linux, BSD, or MacOS. If you have some other OS that
21# supports one of these APIs, add it here and also in the configure 21# supports one of these APIs, add it here and also in the configure
22# script. Solaris support has been hacked on separately. 22# script. Solaris support has been hacked on separately.
23ONLY_FOR_PLATFORM= Linux-*-* 23ONLY_FOR_PLATFORM= Linux-*-*
24ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* FreeBSD-*-* 24ONLY_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* FreeBSD-*-*
25ONLY_FOR_PLATFORM+= Darwin-*-* 25ONLY_FOR_PLATFORM+= Darwin-*-*
26ONLY_FOR_PLATFORM+= SunOS-*-* 26ONLY_FOR_PLATFORM+= SunOS-*-*
27 27
28TEST_TARGET= check 28TEST_TARGET= check
29 29
30CONFLICTS= libusb-compat-[0-9]* 30CONFLICTS= libusb-compat-[0-9]*
31 31
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33 33
34.if ${OPSYS} == "SunOS" 34.if ${OPSYS} == "SunOS"
35CFLAGS+= -D_REENTRANT -D_TS_ERRNO 35CFLAGS+= -D_REENTRANT -D_TS_ERRNO
36CXXFLAGS+= -Du_int8_t=uint8_t 36CXXFLAGS+= -Du_int8_t=uint8_t
37CXXFLAGS+= -Du_int16_t=uint16_t 37CXXFLAGS+= -Du_int16_t=uint16_t
38CXXFLAGS+= -Du_int32_t=uint32_t 38CXXFLAGS+= -Du_int32_t=uint32_t
39SED_TRANSFORMS= -e 's,@BIGENDIAN@,0,' -e 's,@LINUX_API@,0,' 39SED_TRANSFORMS= -e 's,@BIGENDIAN@,0,' -e 's,@LINUX_API@,0,'
40SED_TRANSFORMS+= -e 's,u_int8_t,uint8_t,g' 40SED_TRANSFORMS+= -e 's,u_int8_t,uint8_t,g'
41SED_TRANSFORMS+= -e 's,u_int16_t,uint16_t,g' 41SED_TRANSFORMS+= -e 's,u_int16_t,uint16_t,g'
42SED_TRANSFORMS+= -e 's,u_int32_t,uint32_t,g' 42SED_TRANSFORMS+= -e 's,u_int32_t,uint32_t,g'
43SED_TRANSFORMS+= -e "s,@prefix@,${PREFIX},g" 43SED_TRANSFORMS+= -e "s,@prefix@,${PREFIX},g"
44SED_TRANSFORMS+= -e "s,@exec_prefix@,${PREFIX},g" 44SED_TRANSFORMS+= -e "s,@exec_prefix@,${PREFIX},g"
45SED_TRANSFORMS+= -e "s,@LIBUSB_VERSION@,${PKGVERSION_NOREV},g" 45SED_TRANSFORMS+= -e "s,@LIBUSB_VERSION@,${PKGVERSION_NOREV},g"
46SED_TRANSFORMS+= -e "s,@VERSION@,${PKGVERSION_NOREV},g" 46SED_TRANSFORMS+= -e "s,@VERSION@,${PKGVERSION_NOREV},g"
47SED_TRANSFORMS+= -e "s,@includedir@,${PREFIX}/include,g" 47SED_TRANSFORMS+= -e "s,@includedir@,${PREFIX}/include,g"
48SED_TRANSFORMS+= -e "s,@libdir@,${PREFIX}/lib,g" 48SED_TRANSFORMS+= -e "s,@libdir@,${PREFIX}/lib,g"
49SED_TRANSFORMS+= -e "s,@OSLIBS@,,g" 49SED_TRANSFORMS+= -e "s,@OSLIBS@,,g"
50 50
51INSTALLATION_DIRS+= bin include lib/pkgconfig 51INSTALLATION_DIRS+= bin include lib/pkgconfig
52 52
53do-configure: 53do-configure:
54 cp ${FILESDIR}/libusbugen* ${WRKSRC}/ 54 cp ${FILESDIR}/libusbugen* ${WRKSRC}/
55 55
56do-build: 56do-build:
57 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} usb.h.in >usb.h 57 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} usb.h.in >usb.h
58 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} libusb-config.in >libusb-config 58 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} libusb-config.in >libusb-config
59 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} libusb.pc.in >libusb.pc 59 cd ${WRKSRC} && ${SED} ${SED_TRANSFORMS} libusb.pc.in >libusb.pc
60 cd ${WRKSRC} && ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} \ 60 cd ${WRKSRC} && ${LIBTOOL} --mode=compile --tag=CC ${CC} ${CFLAGS} \
61 -I. -c libusbugen.c 61 -I. -c libusbugen.c
62 cd ${WRKSRC} && ${LIBTOOL} --mode=link --tag=CC ${CC} \ 62 cd ${WRKSRC} && ${LIBTOOL} --mode=link --tag=CC ${CC} \
63 -rpath ${PREFIX}/lib -version-info 8:4:4 -release 0.1 \ 63 -rpath ${PREFIX}/lib -version-info 8:4:4 -release 0.1 \
64 -o libusb.la libusbugen.lo 64 -o libusb.la libusbugen.lo
65 cd ${WRKSRC} && ${LIBTOOL} --mode=compile --tag=CXX ${CXX} ${CXXFLAGS} \ 65 cd ${WRKSRC} && ${LIBTOOL} --mode=compile --tag=CXX ${CXX} ${CXXFLAGS} \
66 -I. -c usbpp.cpp 66 -I. -c usbpp.cpp
67 cd ${WRKSRC} && ${LIBTOOL} --mode=link --tag=CXX ${CXX} \ 67 cd ${WRKSRC} && ${LIBTOOL} --mode=link --tag=CXX ${CXX} \
68 -rpath ${PREFIX}/lib -version-info 8:4:4 -release 0.1 \ 68 -rpath ${PREFIX}/lib -version-info 8:4:4 -release 0.1 \
69 -o libusbpp.la usbpp.lo 69 -o libusbpp.la usbpp.lo
70 70
71do-install: 71do-install:
72 ${INSTALL_SCRIPT} ${WRKSRC}/libusb-config ${DESTDIR}${PREFIX}/bin 72 ${INSTALL_SCRIPT} ${WRKSRC}/libusb-config ${DESTDIR}${PREFIX}/bin
73 ${INSTALL_DATA} ${WRKSRC}/usb.h ${DESTDIR}${PREFIX}/include 73 ${INSTALL_DATA} ${WRKSRC}/usb.h ${DESTDIR}${PREFIX}/include
74 ${INSTALL_DATA} ${WRKSRC}/usbpp.h ${DESTDIR}${PREFIX}/include 74 ${INSTALL_DATA} ${WRKSRC}/usbpp.h ${DESTDIR}${PREFIX}/include
75 cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} libusb.la \ 75 cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} libusb.la \
76 ${DESTDIR}${PREFIX}/lib 76 ${DESTDIR}${PREFIX}/lib
77 cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} libusbpp.la \ 77 cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB} libusbpp.la \
78 ${DESTDIR}${PREFIX}/lib 78 ${DESTDIR}${PREFIX}/lib
79 ${INSTALL_DATA} ${WRKSRC}/libusb.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 79 ${INSTALL_DATA} ${WRKSRC}/libusb.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
80.endif 80.endif
81 81
82BUILDLINK_TRANSFORM+= rm:-Werror 82BUILDLINK_TRANSFORM+= rm:-Werror
83 83
84.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/devel/libusb/distinfo (switch to unified diff)

--- pkgsrc/devel/libusb/distinfo 2019/08/06 09:12:10 1.28
+++ pkgsrc/devel/libusb/distinfo 2019/08/06 09:27:30 1.29
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: distinfo,v 1.28 2019/08/06 09:12:10 maya Exp $ 1$NetBSD: distinfo,v 1.29 2019/08/06 09:27:30 maya Exp $
2 2
3SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807 3SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
4RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e 4RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
5SHA512 (libusb-0.1.12.tar.gz) = 08c10e899f93b5f8567d1a1e1ed87dd5631ad0a1463975404709c1d165e545e340afb474a66788efcfdd8193542e2a2eb9cf133f55cbbf76441244191d0bb825 5SHA512 (libusb-0.1.12.tar.gz) = 08c10e899f93b5f8567d1a1e1ed87dd5631ad0a1463975404709c1d165e545e340afb474a66788efcfdd8193542e2a2eb9cf133f55cbbf76441244191d0bb825
6Size (libusb-0.1.12.tar.gz) = 389343 bytes 6Size (libusb-0.1.12.tar.gz) = 389343 bytes
7SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b 7SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b
8SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839 8SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
9SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055 9SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
10SHA1 (patch-ad) = 8ea70b0501ccd725d19a735699437f67ae76d13d 10SHA1 (patch-ad) = 8ea70b0501ccd725d19a735699437f67ae76d13d
11SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415 11SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
12SHA1 (patch-af) = e46e576a589fb65488011a41df95f744230c0c6c 12SHA1 (patch-af) = e46e576a589fb65488011a41df95f744230c0c6c
13SHA1 (patch-darwin.c) = 20df5d5970bf86f6f4ada002ca16a3bccf5bb4ff 13SHA1 (patch-darwin.c) = 20df5d5970bf86f6f4ada002ca16a3bccf5bb4ff
14SHA1 (patch-descriptors.c) = 14cc1b46f094585fcfbb2ba046b89c3eb5cf49f9 
File Deleted: pkgsrc/devel/libusb/patches/Attic/patch-descriptors.c