d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install libusb20.so.1 as libusb.so.1, there will be a followup commit to the

Browse Source 
ports tree so that programs use libusb from the base by default. Thanks to
Stanislav Sedov for sorting out the ports build.

Bump __FreeBSD_version to 800069

Help and testing by:	stas
This commit is contained in:
Andrew Thompson 2009-03-09 17:05:31 +00:00
parent fe9ee5e879
commit a091d2a525
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=189585
13 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ObsoleteFiles.inc
View File

@ -14,6 +14,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
# 20090308: libusb.so.1 renamed
OLD_LIBS+=usr/lib/libusb20.so.1
OLD_FILES+=usr/include/libusb20_compat01.h
# 20090226: libmp(3) functions renamed
OLD_LIBS+=usr/lib/libmp.so.6
# 20090223: changeover of USB stacks

6
UPDATING
View File

@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
20090309:
libusb20.so.1 is now installed as libusb.so.1 and the ports system
updated to use it. This requires a buildworld/installworld in order to
update the library and dependencies (usbconfig, etc). Its advisable to
update your ports as the affected programs have had a revision bump.
20090302:
A workaround is committed to allow the creation of System V shared
memory segment of size > 2 GB on the 64-bit architectures.

7
lib/libusb20/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for the FreeBSD specific LibUSB 2.0
#
LIB= usb20
LIB= usb
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
SRCS= libusb20.c
@ -14,11 +14,12 @@ SRCS+= libusb20_compat01.c
SRCS+= libusb20_compat10.c
INCS+= libusb20.h
INCS+= libusb20_desc.h
INCS+= libusb20_compat01.h
INCS+= libusb20_compat10.h
MAN= libusb20.3
MKLINT= no
NOGCCERROR=
# libusb 0.1 compat
INCS+= usb.h
.include <bsd.lib.mk>

2
lib/libusb20/libusb20_compat01.c
View File

@ -37,7 +37,7 @@
#include "libusb20.h"
#include "libusb20_desc.h"
#include "libusb20_int.h"
#include "libusb20_compat01.h"
#include "usb.h"
/*
* The two following macros were taken from the original LibUSB v0.1

0
lib/libusb20/libusb20_compat01.h → lib/libusb20/usb.h
View File

2
release/amd64/boot_crunch.conf
View File

@ -42,4 +42,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
libs -lbsdxml -larchive -lbz2 -lusb20
libs -lbsdxml -larchive -lbz2 -lusb

2
release/i386/boot_crunch.conf
View File

@ -42,4 +42,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
libs -lbsdxml -larchive -lbz2 -lusb20
libs -lbsdxml -larchive -lbz2 -lusb

2
release/ia64/boot_crunch.conf
View File

@ -46,4 +46,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
libs -lgeom -lbsdxml -larchive -lbz2 -lusb20
libs -lgeom -lbsdxml -larchive -lbz2 -lusb

2
release/powerpc/boot_crunch.conf
View File

@ -44,4 +44,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
libs -lbsdxml -larchive -lbz2 -lusb20
libs -lbsdxml -larchive -lbz2 -lusb

2
release/sparc64/boot_crunch.conf
View File

@ -42,4 +42,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
libs -larchive -lbz2 -lusb20
libs -larchive -lbz2 -lusb

2
release/sun4v/boot_crunch.conf
View File

@ -42,4 +42,4 @@ progs usbconfig
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
libs -larchive -lbz2 -lusb20
libs -larchive -lbz2 -lusb

2
sys/sys/param.h
View File

@ -57,7 +57,7 @@
* is created, otherwise 1.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 800068 /* Master, propagated to newvers */
#define __FreeBSD_version 800069 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>

2
usr.sbin/usbconfig/Makefile
View File

@ -4,6 +4,6 @@
PROG= usbconfig
MAN= usbconfig.8
SRCS= usbconfig.c dump.c
LDADD+= -lusb20
LDADD+= -lusb
.include <bsd.prog.mk>