From owner-freebsd-ports@FreeBSD.ORG Thu Jul 2 15:05:21 2009 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34D221065694 for ; Thu, 2 Jul 2009 15:05:21 +0000 (UTC) (envelope-from mezz7@cox.net) Received: from eastrmmtao107.cox.net (eastrmmtao107.cox.net [68.230.240.59]) by mx1.freebsd.org (Postfix) with ESMTP id BECAF8FC25 for ; Thu, 2 Jul 2009 15:05:15 +0000 (UTC) (envelope-from mezz7@cox.net) Received: from eastrmimpo03.cox.net ([68.1.16.126]) by eastrmmtao107.cox.net (InterMail vM.7.08.02.01 201-2186-121-102-20070209) with ESMTP id <20090702150515.GWPL4885.eastrmmtao107.cox.net@eastrmimpo03.cox.net>; Thu, 2 Jul 2009 11:05:15 -0400 Received: from localhost ([68.103.37.153]) by eastrmimpo03.cox.net with bizsmtp id B35E1c00B3JFCbG0235E9Y; Thu, 02 Jul 2009 11:05:15 -0400 X-VR-Score: -220.00 X-Authority-Analysis: v=1.0 c=1 a=-C_3ZPTwNAkA:10 a=6I5d2MoRAAAA:8 a=kviXuzpPAAAA:8 a=Z8JsemIFVpmymWuZVRwA:9 a=TnFUQNAWKIVIPj-EqJ4A:7 a=VU7_dud1WVF3KmXX-G0doK5fnJMA:4 a=SV7veod9ZcQA:10 a=4vB-4DCPJfMA:10 X-CM-Score: 0.00 Date: Thu, 02 Jul 2009 10:05:53 -0500 To: "Lawrence Stewart" From: "Jeremy Messenger" Content-Type: text/plain; format=flowed; delsp=yes; charset=utf-8 MIME-Version: 1.0 References: <200906080902.43391.hselasky@c2i.net> <4A4CC9C1.4080200@freebsd.org> Content-Transfer-Encoding: 7bit Message-ID: In-Reply-To: <4A4CC9C1.4080200@freebsd.org> User-Agent: Opera Mail/9.64 (Linux) Cc: freebsd-current@freebsd.org, Hans Petter Selasky , freebsd-usb@freebsd.org, freebsd-ports@freebsd.org, markus@brueffer.de Subject: Re: Temporary patch to fix USB in kdebase4 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2009 15:05:21 -0000 On Thu, 02 Jul 2009 09:52:49 -0500, Lawrence Stewart wrote: > 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: There is no usb_revision.h in recently -CURRENT. I have nothing of it in my system, I always run make delete-old and delete-old-libs. However, I am able to installed both kdebase3 and kdebase4 by tweak in extra-patch-libusb20. All I have to do like this: Change from: +#include To: +/*#include */ As for the kdebase3, I just took a patch from ports/135860 then tweak a bit. I am planning to follow up in its PR. But, I haven't run those in runtime yet thought. Cheers, Mezz > 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 > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org" -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org