Browse files

[osx/ios] fixed, refactor afpfs-ng includes to follow fedora and othe…

…rs, thx sraue. Warning to all, need to rebuild tools/darwin/depends/afpfs-ng
  • Loading branch information...
1 parent 85ec523 commit 8de0f1334e1e65c7ad23d6d794937abec262e285 @davilla davilla committed Sep 10, 2011
View
2 configure.in
@@ -963,7 +963,7 @@ fi
USE_LIBAFPCLIENT=0
if test "$host_vendor" = "apple" ; then
if test "x$use_libafpclient" != "xno"; then
- AC_CHECK_HEADERS([afp/libafpclient.h],,
+ AC_CHECK_HEADERS([afpfs-ng/libafpclient.h],,
[if test "x$use_libafpclient" = "xyes"; then
AC_MSG_ERROR($libafpclient_not_found)
elif test "x$use_libafpclient" != "xno"; then
View
12 tools/darwin/depends/afpfs-ng/02-pointer.patch
@@ -33,9 +33,9 @@ diff -up afpfs-ng-0.8.1/fuse/fuse_int.c.pointer afpfs-ng-0.8.1/fuse/fuse_int.c
return ret;
}
-diff -up afpfs-ng-0.8.1/include/afp.h.pointer afpfs-ng-0.8.1/include/afp.h
---- afpfs-ng-0.8.1/include/afp.h.pointer 2008-03-08 17:08:18.000000000 +0100
-+++ afpfs-ng-0.8.1/include/afp.h 2011-06-14 17:02:15.000000000 +0200
+diff -up afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer afpfs-ng-0.8.1/include/afp.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/afp.h.pointer 2008-03-08 17:08:18.000000000 +0100
++++ afpfs-ng-0.8.1/include/afpfs-ng/afp.h 2011-06-14 17:02:15.000000000 +0200
@@ -370,7 +370,7 @@ int afp_unmount_all_volumes(struct afp_s
int afp_opendt(struct afp_volume *volume, unsigned short * refnum);
@@ -45,9 +45,9 @@ diff -up afpfs-ng-0.8.1/include/afp.h.pointer afpfs-ng-0.8.1/include/afp.h
int afp_getcomment(struct afp_volume *volume, unsigned int did,
const char * pathname, struct afp_comment * comment);
-diff -up afpfs-ng-0.8.1/include/utils.h.pointer afpfs-ng-0.8.1/include/utils.h
---- afpfs-ng-0.8.1/include/utils.h.pointer 2008-02-18 04:33:58.000000000 +0100
-+++ afpfs-ng-0.8.1/include/utils.h 2011-06-14 17:02:15.000000000 +0200
+diff -up afpfs-ng-0.8.1/include/afpfs-gn/utils.h.pointer afpfs-ng-0.8.1/include/utils.h
+--- afpfs-ng-0.8.1/include/afpfs-ng/utils.h.pointer 2008-02-18 04:33:58.000000000 +0100
++++ afpfs-ng-0.8.1/include/afpfs-ng/utils.h 2011-06-14 17:02:15.000000000 +0200
@@ -8,8 +8,8 @@
#define hton64(x) (x)
#define ntoh64(x) (x)
View
13 tools/darwin/depends/afpfs-ng/03-include.patch
@@ -1,13 +0,0 @@
---- include/afp.h 2011-08-25 20:58:17.000000000 +0200
-+++ include/afp.h 2011-08-25 21:15:14.000000000 +0200
-@@ -7,8 +7,8 @@
- #include <netdb.h>
- #include <sys/statvfs.h>
- #include <pwd.h>
--#include <afp_protocol.h>
--#include <libafpclient.h>
-+#include <afp/afp_protocol.h>
-+#include <afp/libafpclient.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
View
4 tools/darwin/depends/afpfs-ng/04-boxee1.patch
@@ -1,5 +1,5 @@
---- afpfs-ng-0.8.1/include/dsi.h 2008-02-18 04:33:24.000000000 +0100
-+++ afpfs-ng-0.8.1/include/dsi.h 2011-08-26 21:33:33.000000000 +0200
+--- afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 2008-02-18 04:33:24.000000000 +0100
++++ afpfs-ng-0.8.1/include/afpfs-ng/dsi.h 2011-08-26 21:33:33.000000000 +0200
@@ -6,13 +6,15 @@
struct dsi_request
View
2 tools/darwin/depends/afpfs-ng/07-boxee4.patch
@@ -2,7 +2,7 @@
+++ afpfs-ng-0.8.1/lib/identify.c 2011-08-26 21:33:33.000000000 +0200
@@ -0,0 +1,24 @@
+#include <string.h>
-+#include "afp.h"
++#include <afpfs-ng/afp.h>
+
+
+/*
View
24 tools/darwin/depends/afpfs-ng/09-boxee6.patch
@@ -1,24 +0,0 @@
---- afpfs-ng-0.8.1/lib/Makefile.am 2011-08-26 22:00:06.000000000 +0200
-+++ afpfs-ng-0.8.1/lib/Makefile.am.new 2011-08-26 22:02:55.000000000 +0200
-@@ -1,4 +1,4 @@
--
-+afpdir = $(includedir)/afp
-
- libafpclient_la_CFLAGS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/include @CFLAGS@
-
-@@ -8,4 +8,13 @@
-
- # libafpclient_la_LDFLAGS = -module -avoid-version
-
--
-+dist_afp_HEADERS = \
-+ ../include/afp.h \
-+ ../include/afp_protocol.h \
-+ ../include/codepage.h \
-+ ../include/dsi.h \
-+ ../include/libafpclient.h \
-+ ../include/map_def.h \
-+ ../include/midlevel.h \
-+ ../include/uams_def.h \
-+ ../include/utils.h
-\ No newline at end of file
View
4 tools/darwin/depends/afpfs-ng/10-fix-errno.patch
@@ -6,8 +6,8 @@
#include <sys/socket.h>
-#include <errno.h>
- #include "afp_protocol.h"
- #include "libafpclient.h"
+ #include <afpfs-ng/afp_protocol.h>
+ #include <afpfs-ng/libafpclient.h>
--- afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:42:42.000000000 +0200
+++ afpfs-ng-0.8.1/lib/afp_url.c 2011-09-04 19:40:27.000000000 +0200
@@ -21,7 +21,9 @@
View
3 tools/darwin/depends/afpfs-ng/Makefile
@@ -23,14 +23,14 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
rm -rf $(SOURCE)
$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
echo $(SOURCE) > .gitignore
+ cd $(SOURCE); patch -p1 <../fix_afpfs-ng_includes.patch
cd $(SOURCE); patch -p1 <../01-gcrypt.patch
cd $(SOURCE); patch -p1 <../02-pointer.patch
cd $(SOURCE); patch -p1 <../04-boxee1.patch
cd $(SOURCE); patch -p1 <../05-boxee2.patch
cd $(SOURCE); patch -p1 <../06-boxee3.patch
cd $(SOURCE); patch -p1 <../07-boxee4.patch
cd $(SOURCE); patch -p1 <../08-boxee5.patch
- cd $(SOURCE); patch -p1 <../09-boxee6.patch
cd $(SOURCE); patch -p1 <../10-fix-errno.patch
cd $(SOURCE); autoreconf -vif
cd $(SOURCE); $(CONFIGURE)
@@ -40,7 +40,6 @@ $(LIBDYLIB): $(SOURCE)
.installed:
make -C $(SOURCE) install
- patch -p1 $(PREFIX)/include/afp/afp.h 03-include.patch
touch $@
clean:
View
3,082 tools/darwin/depends/afpfs-ng/fix_afpfs-ng_includes.patch
3,082 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
6 xbmc/filesystem/DllLibAfp.h
@@ -27,9 +27,9 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include <afp/libafpclient.h>
-#include <afp/map_def.h>
-#include <afp/midlevel.h>
+#include <afpfs-ng/libafpclient.h>
+#include <afpfs-ng/map_def.h>
+#include <afpfs-ng/midlevel.h>
#ifdef __cplusplus
}
#endif

0 comments on commit 8de0f13

Please sign in to comment.