[csw-devel] SF.net SVN: gar:[9991] csw/mgar/pkg/libtorrent/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed May 26 16:56:21 CEST 2010


Revision: 9991
          http://gar.svn.sourceforge.net/gar/?rev=9991&view=rev
Author:   dmichelsen
Date:     2010-05-26 14:56:20 +0000 (Wed, 26 May 2010)

Log Message:
-----------
libtorrent: Enable 64 bit and shuffle things around

Modified Paths:
--------------
    csw/mgar/pkg/libtorrent/trunk/Makefile
    csw/mgar/pkg/libtorrent/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch

Removed Paths:
-------------
    csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch
    csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch

Modified: csw/mgar/pkg/libtorrent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/Makefile	2010-05-26 14:34:36 UTC (rev 9990)
+++ csw/mgar/pkg/libtorrent/trunk/Makefile	2010-05-26 14:56:20 UTC (rev 9991)
@@ -16,30 +16,30 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-#Patches mostly from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/
-
+# Patches from http://cr.opensolaris.org/~alz/bittorrent/raw_files/new/usr/src/lib/libtorrent/
 PATCHFILES = rlibtorrent-04-sunpro.diff rlibtorrent-01-madvise.diff rlibtorrent-03-dh-generate.diff
-PATCHFILES += rlibtorrent-05-tracker-usable.diff work-around-UNUSED.patch more-UNUSED.patch
+PATCHFILES += rlibtorrent-05-tracker-usable.diff
 
+PATCHFILES += 0001-Ignore-__UNUSED.patch
 
-RUNTIME_DEP_PKGS_CSWlibtorrent += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibtorrent += CSWlibsigc++rt
+BUILD_DEP_pkgs = CSWossldevel CSWlibsigc++devel
 
-PACKAGES  = CSWlibtorrent
-PACKAGES += CSWlibtorrentdevel
-SPKG_DESC_CSWlibtorrent = BitTorrent library written in C++ for *nix
-SPKG_DESC_CSWlibtorrentdevel = Header files for libtorrent
+PACKAGES  = CSWlibtorrent CSWlibtorrentdevel
 
-CATALOGNAME_CSWlibtorrent= libtorrent
+CATALOGNAME_CSWlibtorrent      = libtorrent
 CATALOGNAME_CSWlibtorrentdevel = libtorrent_devel
 
+SPKG_DESC_CSWlibtorrent      = BitTorrent library written in C++ for *nix
+SPKG_DESC_CSWlibtorrentdevel = Development files for libtorrent
+
+RUNTIME_DEP_PKGS_CSWlibtorrent = CSWosslrt CSWlibsigc++
+
 PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibtorrentdevel += $(docdir)/.*
 PKGFILES_CSWlibtorrentdevel += .*\.h
 PKGFILES_CSWlibtorrentdevel += $(sharedstatedir)/.*
 
-#No 64bit build until libsigc++ is 64bit too
-#BUILD64 = 1
+BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/libtorrent/trunk/checksums
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/checksums	2010-05-26 14:34:36 UTC (rev 9990)
+++ csw/mgar/pkg/libtorrent/trunk/checksums	2010-05-26 14:56:20 UTC (rev 9991)
@@ -1,7 +1,6 @@
+a60c38bec6f1f18c6055894b15e3cb82  0001-Ignore-__UNUSED.patch
 037499ed708aaf72988cee60e5a8d96b  libtorrent-0.12.6.tar.gz
-373bec9d71c3cad06c669e26857ef14b  more-UNUSED.patch
 eb30844ace9f064a8fca5212f5a99fef  rlibtorrent-01-madvise.diff
 f2f3738edcbc8d7ccfa14e784f3af9c6  rlibtorrent-03-dh-generate.diff
 c13befd35c91a36f78151accdc70c62c  rlibtorrent-04-sunpro.diff
 0d1545bbc1e7c9f5d4de059c855b0f81  rlibtorrent-05-tracker-usable.diff
-9c0cccb56d3a03eeb14739d811259187  work-around-UNUSED.patch

Copied: csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch (from rev 9976, csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch)
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch	                        (rev 0)
+++ csw/mgar/pkg/libtorrent/trunk/files/0001-Ignore-__UNUSED.patch	2010-05-26 14:56:20 UTC (rev 9991)
@@ -0,0 +1,67 @@
+From 6772f16c668c4e8567087d4c5fe2a4c9433a733e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 26 May 2010 15:37:18 +0200
+Subject: [PATCH] Ignore __UNUSED
+
+---
+ rak/string_manip.h             |    2 ++
+ src/download/chunk_selector.cc |    2 ++
+ src/torrent/poll_kqueue.cc     |    2 ++
+ src/torrent/resume.cc          |    2 ++
+ 4 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/rak/string_manip.h b/rak/string_manip.h
+index 4fb2554..9d66e96 100644
+--- a/rak/string_manip.h
++++ b/rak/string_manip.h
+@@ -43,6 +43,8 @@
+ #include <iterator>
+ #include <locale>
+ 
++#define __UNUSED
++
+ namespace rak {
+ 
+ // Use these trim functions until n1872 is widely supported.
+diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc
+index d3c956b..7f2df87 100644
+--- a/src/download/chunk_selector.cc
++++ b/src/download/chunk_selector.cc
+@@ -46,6 +46,8 @@
+ #include "chunk_selector.h"
+ #include "chunk_statistics.h"
+ 
++#define __UNUSED
++
+ namespace torrent {
+ 
+ // Consider making statistics a part of selector.
+diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc
+index 0375b91..1ade627 100644
+--- a/src/torrent/poll_kqueue.cc
++++ b/src/torrent/poll_kqueue.cc
+@@ -56,6 +56,8 @@
+ 
+ #include <assert.h>
+ 
++#define __UNUSED
++
+ namespace torrent {
+ 
+ #ifdef USE_KQUEUE
+diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc
+index a728830..59c7cf6 100644
+--- a/src/torrent/resume.cc
++++ b/src/torrent/resume.cc
+@@ -58,6 +58,8 @@
+ 
+ #include "resume.h"
+ 
++#define __UNUSED
++
+ namespace torrent {
+ 
+ void
+-- 
+1.7.0
+

Deleted: csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch	2010-05-26 14:34:36 UTC (rev 9990)
+++ csw/mgar/pkg/libtorrent/trunk/files/more-UNUSED.patch	2010-05-26 14:56:20 UTC (rev 9991)
@@ -1,25 +0,0 @@
-From 9f0bae87a21f0256f1848b8d8f74d90e533ae4d6 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at current9s.(none)>
-Date: Thu, 20 May 2010 12:43:55 +0200
-Subject: [PATCH] more-UNUSED
-
----
- src/torrent/resume.cc |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/torrent/resume.cc b/src/torrent/resume.cc
-index dd53f71..5480220 100644
---- a/src/torrent/resume.cc
-+++ b/src/torrent/resume.cc
-@@ -58,6 +58,8 @@
- 
- #include "resume.h"
- 
-+#define __UNUSED
-+
- namespace torrent {
- 
- void
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch	2010-05-26 14:34:36 UTC (rev 9990)
+++ csw/mgar/pkg/libtorrent/trunk/files/work-around-UNUSED.patch	2010-05-26 14:56:20 UTC (rev 9991)
@@ -1,53 +0,0 @@
-From 5a6aaf6dd0b924c323d591986117823457bdb387 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at current9s.(none)>
-Date: Thu, 20 May 2010 10:59:04 +0200
-Subject: [PATCH] work around __UNUSED
-
----
- rak/string_manip.h             |    2 ++
- src/download/chunk_selector.cc |    2 ++
- src/torrent/poll_kqueue.cc     |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/rak/string_manip.h b/rak/string_manip.h
-index b3f3037..a4f1a6c 100644
---- a/rak/string_manip.h
-+++ b/rak/string_manip.h
-@@ -43,6 +43,8 @@
- #include <iterator>
- #include <locale>
- 
-+#define __UNUSED
-+
- namespace rak {
- 
- // Use these trim functions until n1872 is widely supported.
-diff --git a/src/download/chunk_selector.cc b/src/download/chunk_selector.cc
-index f814cb2..5685dc1 100644
---- a/src/download/chunk_selector.cc
-+++ b/src/download/chunk_selector.cc
-@@ -46,6 +46,8 @@
- #include "chunk_selector.h"
- #include "chunk_statistics.h"
- 
-+#define __UNUSED
-+
- namespace torrent {
- 
- // Consider making statistics a part of selector.
-diff --git a/src/torrent/poll_kqueue.cc b/src/torrent/poll_kqueue.cc
-index 9d4d68a..94e8115 100644
---- a/src/torrent/poll_kqueue.cc
-+++ b/src/torrent/poll_kqueue.cc
-@@ -53,6 +53,8 @@
- #include <sys/time.h>
- #endif
- 
-+#define __UNUSED
-+
- namespace torrent {
- 
- #ifdef USE_KQUEUE
--- 
-1.7.1
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list