mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix build on 4.x

Browse Source
This commit is contained in:
Michael Nottebrock 2006-12-12 18:34:30 +00:00
parent 7bbc1fc7e6
commit 0a26007cbf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=179584
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/libgphoto2/files/patch-camlibs_canon-usb.c Normal file
View File

@ -0,0 +1,18 @@
--- camlibs/canon/usb.c.orig Tue Dec 12 19:09:39 2006
+++ camlibs/canon/usb.c Tue Dec 12 19:10:26 2006
@@ -1308,6 +1308,7 @@
int j, canon_subfunc = 0;
char subcmd = 0, *subfunct_descr = "";
int additional_read_bytes = 0;
+ char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
/* clear this to indicate that no data is there if we abort */
if (return_length)
@@ -1546,7 +1547,6 @@
}
}
- char *msg = canon_usb_decode_status ( le32atoh ( buffer+0x50 ) );
if ( msg != NULL ) {
GP_DEBUG ( "canon_usb_dialogue_full: camera status \"%s\""
" in response to command 0x%x 0x%x 0x%x (%s)",

31
graphics/libgphoto2/files/patch-camlibs_ptp2-config.c Normal file
View File

@ -0,0 +1,31 @@
--- camlibs/ptp2/config.c.orig Tue Dec 12 18:43:53 2006
+++ camlibs/ptp2/config.c Tue Dec 12 19:00:45 2006
@@ -19,6 +19,8 @@
*/
#include "config.h"
+#include <sys/types.h>
+#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@ -1739,15 +1741,14 @@
static int
_get_nikon_list_wifi_profiles (CONFIG_GET_ARGS)
{
- gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget);
- gp_widget_set_name (*widget, menu->name);
-
- CameraWidget *child;
-
int ret;
char buffer[4096];
int i;
+ CameraWidget *child;
PTPParams *params = &(camera->pl->params);
+
+ gp_widget_new (GP_WIDGET_SECTION, _(menu->label), widget);
+ gp_widget_set_name (*widget, menu->name);
if (params->deviceinfo.VendorExtensionID != PTP_VENDOR_NIKON)
return (GP_ERROR_NOT_SUPPORTED);