--- a/components/rtorrent/Makefile Tue Sep 20 03:54:40 2016 -0700
+++ b/components/rtorrent/Makefile Tue Sep 20 05:30:15 2016 -0700
@@ -29,13 +29,13 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= rtorrent
-COMPONENT_VERSION= 0.8.2
-COMPONENT_PROJECT_URL= http://libtorrent.rakshasa.no/
+COMPONENT_VERSION= 0.9.6
+COMPONENT_PROJECT_URL= https://rakshasa.github.io/rtorrent/
COMPONENT_ARCHIVE_HASH= \
- sha256:76135a63869e43fa0392829bb45d94c0aa55e94350dddc272685ccfac1bbb2ed
-COMPONENT_ARCHIVE_URL= http://libtorrent.rakshasa.no/downloads/$(COMPONENT_ARCHIVE)
+ sha256:1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e
+COMPONENT_ARCHIVE_URL= http://rtorrent.net/downloads/$(COMPONENT_ARCHIVE)
-TPNO= 8824
+TPNO= 24573
TEST_TARGET= $(NO_TESTS)
@@ -51,15 +51,6 @@
COMPONENT_PRE_CONFIGURE_ACTION = \
($(CLONEY) $(SOURCE_DIR) $(@D))
-# requires an older automake to reconfigure
-COMPONENT_PREP_ACTION = \
- (cd $(@D) ; \
- aclocal-1.11 -I./scripts -I. ; \
- autoheader; \
- libtoolize --automake --copy --force; \
- automake-1.11; \
- autoconf )
-
CXXFLAGS += -std=c++11
LDFLAGS += -L$(GNULIB64) -R$(GNULIB64)
@@ -67,23 +58,26 @@
LDFLAGS += -lnsl -lsocket
endif
-CXXFLAGS += -I$(USRINCDIR)/ncurses
-CONFIGURE_OPTIONS.64 += --srcdir=$(BUILD_DIR_64)
-CONFIGURE_OPTIONS += --disable-debug
+CXXFLAGS += -I$(USRINCDIR)/ncurses
+CONFIGURE_OPTIONS.64 += --srcdir=$(BUILD_DIR_64)
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --disable-debug
# Delete this when libtorrent is updated in the build servers
LIBTORRENT_BASE = $(WS_COMPONENTS)/libtorrent/build/prototype/$(MACH)
-PKG_CONFIG_PATHS += $(LIBTORRENT_BASE)$(PKG_CONFIG_PATH.$(BITS))
-LD_OPTIONS += -L$(LIBTORRENT_BASE)$(USRLIB.$(BITS))
-CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)/torrent
-COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_$(BITS)="$(LIBTORRENT_BASE)$(USRLIB.$(BITS))"
+PKG_CONFIG_PATHS += $(LIBTORRENT_BASE)$(PKG_CONFIG_PATH.$(BITS))
+LD_OPTIONS += -L$(LIBTORRENT_BASE)$(USRLIB.$(BITS))
+CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)
+CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)/torrent
+CXXFLAGS += -I$(LIBTORRENT_BASE)$(USRINCDIR)/torrent/utils
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH_$(BITS)="$(LIBTORRENT_BASE)$(USRLIB.$(BITS))"
#end Delete
-REQUIRED_PACKAGES += developer/build/automake-111
+REQUIRED_PACKAGES += developer/build/automake-115
REQUIRED_PACKAGES += library/c++/sigcpp
REQUIRED_PACKAGES += library/libtorrent
REQUIRED_PACKAGES += library/ncurses
-REQUIRED_PACKAGES += system/library/c++-runtime
REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
REQUIRED_PACKAGES += system/library/math