Date: Mon, 14 Oct 2002 04:46:12 -0500 (CDT) From: Kyle Martin <mkm@ieee.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: stijn@win.tue.nl Subject: ports/44042: [PATCH] fixes broken port emulators/xmame Message-ID: <20021014094612.A122EAA0D@marvin.bsdng.org>
next in thread | raw e-mail | index | archive | help
>Number: 44042 >Category: ports >Synopsis: [PATCH] fixes broken port emulators/xmame >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 14 02:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Kyle Martin >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: >Environment: System: FreeBSD marvin.bsdng.org 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #4: Sun Sep 15 02:14:19 CDT 2002 root@marvin.bsdng.org:/usr/src/sys/compile/MARVIN i386 >Description: in a pr the maintainer stated that the usb changes broke the port, and he was unable to fix it, so he submitted a patch that simply disabled usb joysticks, the patch was never committed, and shouldnt be, as this patch fixes the problem rather than disabling it :) >How-To-Repeat: apply the patch below >Fix: diff -crN /usr/ports/emulators/xmame/files/patch-ag ./files/patch-ag *** /usr/ports/emulators/xmame/files/patch-ag Wed Dec 31 18:00:00 1969 --- ./files/patch-ag Mon Oct 14 04:27:37 2002 *************** *** 0 **** --- 1,63 ---- + diff -crN ../../work.old/xmame-0.60.1/src/unix/joystick-drivers/joy_usb.c ./src/unix/joystick-drivers/joy_usb.c + *** ../../work.old/xmame-0.60.1/src/unix/joystick-drivers/joy_usb.c Mon Oct 14 03:49:37 2002 + --- ./src/unix/joystick-drivers/joy_usb.c Mon Oct 14 04:23:14 2002 + *************** + *** 27,33 **** + #include <usb.h> + #endif + #elif defined(__ARCH_freebsd) + ! #include <libusb.h> + #endif + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> + --- 27,33 ---- + #include <usb.h> + #endif + #elif defined(__ARCH_freebsd) + ! #include <libusbhid.h> + #endif + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> + *************** + *** 96,102 **** + size = hid_report_size(rd, hid_input, report_id); + priv_joy_data[i].offset = 0; + #else + ! size = hid_report_size(rd, hid_input, &report_id); + priv_joy_data[i].offset = (report_id != 0); + #endif + if ((priv_joy_data[i].data_buf = malloc(size)) == NULL) + --- 96,102 ---- + size = hid_report_size(rd, hid_input, report_id); + priv_joy_data[i].offset = 0; + #else + ! size = hid_report_size(rd, hid_input, report_id); + priv_joy_data[i].offset = (report_id != 0); + #endif + if ((priv_joy_data[i].data_buf = malloc(size)) == NULL) + diff -crN ../../work.old/xmame-0.60.1/src/unix/unix.mak ./src/unix/unix.mak + *** ../../work.old/xmame-0.60.1/src/unix/unix.mak Mon Oct 14 03:49:38 2002 + --- ./src/unix/unix.mak Mon Oct 14 04:23:14 2002 + *************** + *** 240,249 **** + CONFIG += -DHAVE_USBHID_H + MY_LIBS += -lusbhid + else + ! MY_LIBS += /usr/lib/libusb.a + endif + else + ! MY_LIBS += -lusb + endif + endif + endif + --- 240,249 ---- + CONFIG += -DHAVE_USBHID_H + MY_LIBS += -lusbhid + else + ! MY_LIBS += /usr/lib/libusbhid.a + endif + else + ! MY_LIBS += -lusbhid + endif + endif + endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021014094612.A122EAA0D>