Re: Temporary patch to fix USB in kdebase4

Hans Petter Selasky wrote:
> See attachment.
> --HPS

Any chance you (or someone with the right clue) could update this patch 
to work with more recent 8-CURRENT? I get the following output when 
trying to compile kdebase4 (which applies your original patch as 
extra-patch-libusb20) on r195046 world/kernel:


Scanning dependencies of target kcm_usb 

[ 67%] Building CXX object 
apps/kinfocenter/usbview/CMakeFiles/kcm_usb.dir/kcm_usb_automoc.o
[ 67%] Building CXX object 
apps/kinfocenter/usbview/CMakeFiles/kcm_usb.dir/kcmusb.o
In file included from 
/usr/ports/x11/kdebase4/work/kdebase-4.2.4/apps/kinfocenter/usbview/usbdevices.h:20, 
 

                  from 
/usr/ports/x11/kdebase4/work/kdebase-4.2.4/apps/kinfocenter/usbview/kcmusb.cpp:27: 
 

/usr/include/dev/usb/usb_revision.h:33: error: multiple definition of 
'enum usb_dev_speed'
/usr/include/dev/usb/usb.h:686: error: previous definition here 

/usr/include/dev/usb/usb_revision.h:34: error: conflicting declaration 
'USB_SPEED_VARIABLE'
/usr/include/dev/usb/usb.h:687: error: 'USB_SPEED_VARIABLE' has a 
previous declaration as 'usb_dev_speed USB_SPEED_VARIABLE' 

/usr/include/dev/usb/usb_revision.h:35: error: conflicting declaration 
'USB_SPEED_LOW'
/usr/include/dev/usb/usb.h:688: error: 'USB_SPEED_LOW' has a previous 
declaration as 'usb_dev_speed USB_SPEED_LOW' 

/usr/include/dev/usb/usb_revision.h:36: error: conflicting declaration 
'USB_SPEED_FULL'
/usr/include/dev/usb/usb.h:689: error: 'USB_SPEED_FULL' has a previous 
declaration as 'usb_dev_speed USB_SPEED_FULL' 

/usr/include/dev/usb/usb_revision.h:37: error: conflicting declaration 
'USB_SPEED_HIGH'
/usr/include/dev/usb/usb.h:690: error: 'USB_SPEED_HIGH' has a previous 
declaration as 'usb_dev_speed USB_SPEED_HIGH' 

/usr/include/dev/usb/usb_revision.h:38: error: conflicting declaration 
'USB_SPEED_SUPER'
/usr/include/dev/usb/usb.h:691: error: 'USB_SPEED_SUPER' has a previous 
declaration as 'usb_dev_speed USB_SPEED_SUPER' 

/usr/include/dev/usb/usb_revision.h:45: error: multiple definition of 
'enum usb_revision'
/usr/include/dev/usb/usb.h:698: error: previous definition here 

/usr/include/dev/usb/usb_revision.h:46: error: conflicting declaration 
'USB_REV_UNKNOWN'
/usr/include/dev/usb/usb.h:699: error: 'USB_REV_UNKNOWN' has a previous 
declaration as 'usb_revision USB_REV_UNKNOWN' 

/usr/include/dev/usb/usb_revision.h:47: error: conflicting declaration 
'USB_REV_PRE_1_0'
/usr/include/dev/usb/usb.h:700: error: 'USB_REV_PRE_1_0' has a previous 
declaration as 'usb_revision USB_REV_PRE_1_0' 

/usr/include/dev/usb/usb_revision.h:48: error: conflicting declaration 
'USB_REV_1_0'
/usr/include/dev/usb/usb.h:701: error: 'USB_REV_1_0' has a previous 
declaration as 'usb_revision USB_REV_1_0' 

/usr/include/dev/usb/usb_revision.h:49: error: conflicting declaration 
'USB_REV_1_1'
/usr/include/dev/usb/usb.h:702: error: 'USB_REV_1_1' has a previous 
declaration as 'usb_revision USB_REV_1_1' 

/usr/include/dev/usb/usb_revision.h:50: error: conflicting declaration 
'USB_REV_2_0'
/usr/include/dev/usb/usb.h:703: error: 'USB_REV_2_0' has a previous 
declaration as 'usb_revision USB_REV_2_0' 

/usr/include/dev/usb/usb_revision.h:51: error: conflicting declaration 
'USB_REV_2_5'
/usr/include/dev/usb/usb.h:704: error: 'USB_REV_2_5' has a previous 
declaration as 'usb_revision USB_REV_2_5' 

/usr/include/dev/usb/usb_revision.h:52: error: conflicting declaration 
'USB_REV_3_0'
/usr/include/dev/usb/usb.h:705: error: 'USB_REV_3_0' has a previous 
declaration as 'usb_revision USB_REV_3_0' 

/usr/include/dev/usb/usb_revision.h:59: error: multiple definition of 
'enum usb_hc_mode'
/usr/include/dev/usb/usb.h:712: error: previous definition here 

/usr/include/dev/usb/usb_revision.h:60: error: conflicting declaration 
'USB_MODE_HOST'
/usr/include/dev/usb/usb.h:713: error: 'USB_MODE_HOST' has a previous 
declaration as 'usb_hc_mode USB_MODE_HOST' 

/usr/include/dev/usb/usb_revision.h:61: error: conflicting declaration 
'USB_MODE_DEVICE'
/usr/include/dev/usb/usb.h:714: error: 'USB_MODE_DEVICE' has a previous 
declaration as 'usb_hc_mode USB_MODE_DEVICE' 

/usr/include/dev/usb/usb_revision.h:62: error: conflicting declaration 
'USB_MODE_DUAL'
/usr/include/dev/usb/usb.h:715: error: 'USB_MODE_DUAL' has a previous 
declaration as 'usb_hc_mode USB_MODE_DUAL' 

/usr/include/dev/usb/usb_revision.h:69: error: multiple definition of 
'enum usb_dev_state'
/usr/include/dev/usb/usb.h:722: error: previous definition here 

/usr/include/dev/usb/usb_revision.h:70: error: conflicting declaration 
'USB_STATE_DETACHED'
/usr/include/dev/usb/usb.h:723: error: 'USB_STATE_DETACHED' has a 
previous declaration as 'usb_dev_state USB_STATE_DETACHED' 

/usr/include/dev/usb/usb_revision.h:71: error: conflicting declaration 
'USB_STATE_ATTACHED'
/usr/include/dev/usb/usb.h:724: error: 'USB_STATE_ATTACHED' has a 
previous declaration as 'usb_dev_state USB_STATE_ATTACHED' 

/usr/include/dev/usb/usb_revision.h:72: error: conflicting declaration 
'USB_STATE_POWERED'
/usr/include/dev/usb/usb.h:725: error: 'USB_STATE_POWERED' has a 
previous declaration as 'usb_dev_state USB_STATE_POWERED' 

/usr/include/dev/usb/usb_revision.h:73: error: conflicting declaration 
'USB_STATE_ADDRESSED'
/usr/include/dev/usb/usb.h:726: error: 'USB_STATE_ADDRESSED' has a 
previous declaration as 'usb_dev_state USB_STATE_ADDRESSED' 

/usr/include/dev/usb/usb_revision.h:74: error: conflicting declaration 
'USB_STATE_CONFIGURED'
/usr/include/dev/usb/usb.h:727: error: 'USB_STATE_CONFIGURED' has a 
previous declaration as 'usb_dev_state USB_STATE_CONFIGURED' 

*** Error code 1 


Stop in /usr/ports/x11/kdebase4/work/kdebase-4.2.4/build.
*** Error code 1

Stop in /usr/ports/x11/kdebase4/work/kdebase-4.2.4/build.
*** Error code 1

Stop in /usr/ports/x11/kdebase4/work/kdebase-4.2.4/build.
*** Error code 1

Stop in /usr/ports/x11/kdebase4.




Cheers,
Lawrence