Attachment 25774 Details for Bug 44042 – file.diff

[patch] file.diff

file.diff (text/plain), 2.05 KB, created by Kyle Martin on 2002-10-14 10:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Martin

Created: 2002-10-14 10:50:01 UTC

Size: 2.05 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 44042: 25774