[SM-Commit] GIT changes to master grimoire by Arjan Bouter (3e48f10f96ec0a07931e63ae5ff8fbc07dd4f842)

Arjan Bouter scm at sourcemage.org
Tue Sep 20 09:23:49 EDT 2011


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 audio-players/mpd/DEPENDS       |    5 +++
 audio-players/mpd/HISTORY       |    3 ++
 ftp-libs/libtorrent/DETAILS     |    4 +--
 ftp-libs/libtorrent/HISTORY     |    4 +++
 ftp-libs/libtorrent/PRE_BUILD   |    3 --
 ftp-libs/libtorrent/gcc44.patch |   53 ----------------------------------------
 6 files changed, 14 insertions(+), 58 deletions(-)

New commits:
commit 6f28fb8f5886eb06384c8bf05b316aab1c0c043e
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    mpd: added wildmidi support

commit c9db6aceb2963485c2e3d9ca0bc5583d31d37be7
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    libtorrent: version 0.12.9, removed obsolete patch

diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index e293595..9aa66f8 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -129,6 +129,11 @@ optional_depends libmodplug \
                  "--disable-modplug" \
                  "for mod file support (libmodplug)" &&
 
+optional_depends wildmidi \
+                 "--enable-wildmidi" \
+                 "--disable-wildmidi" \
+                 "for MIDI support via wildmidi" &&
+
 optional_depends fluidsynth \
                  "--enable-fluidsynth" \
                  "--disable-fluidsynth" \
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 15fcd87..2c9ccdd 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: added wildmidi support
+
 2011-09-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.16.4
 
diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 1bee5af..1b22696 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,12 +1,12 @@
            SPELL=libtorrent
-         VERSION=0.12.7
+         VERSION=0.12.9
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
         WEB_SITE=http://libtorrent.rakshasa.no
          ENTERED=20050117
       LICENSE[0]=GPL
-     SOURCE_HASH=sha512:faa1b2cb2248197d2b41046c24bd6c85f2f42505f8b89509ffb04f072de4817d07d86d9a33332e395854f56ee8da252d2e260c650ec1fe14cc00b8b39a6e2f16
+     SOURCE_HASH=sha512:dde2c4edbf08edce5bcb2c3487b8a5952a1e84f84ccd2c54e3f6530571b87bd994f4fc0e8175e0188adf831f562c9c35ae8b7f318d81543c590a1eb37151774c
         KEYWORDS="bittorrent ftp libs"
            SHORT='LibTorrent is a BitTorrent library written in C++ for *nix.'
 cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index 112dda6..be93708 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-09-20 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: updated spell to 0.12.9
+	* PRE_BUILD, gcc44.patch: removed patch, no longer needed
+
 2010-10-26 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 0.12.7
 
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
deleted file mode 100755
index e040c99..0000000
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build                          &&
-cd ${SOURCE_DIRECTORY}                     &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc44.patch
diff --git a/ftp-libs/libtorrent/gcc44.patch b/ftp-libs/libtorrent/gcc44.patch
deleted file mode 100644
index fd534d8..0000000
--- a/ftp-libs/libtorrent/gcc44.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.4-gcc44.patch?rev=1.2
-#
-diff -Nurp libtorrent-0.12.4.old/src/torrent/poll_epoll.cc libtorrent-0.12.4/src/torrent/poll_epoll.cc
---- libtorrent-0.12.4.old/src/torrent/poll_epoll.cc     2008-10-28 06:49:47.000000000 -0500
-+++ libtorrent-0.12.4/src/torrent/poll_epoll.cc 2009-02-04 09:45:22.000000000 -0600
-@@ -37,6 +37,7 @@
- #include "config.h"
-
- #include <cerrno>
-+#include <cstdio>
- #include <cstring>
-
- #include <unistd.h>
-
-
-diff -Nurp libtorrent-0.12.4.old/src/protocol/extensions.cc libtorrent-0.12.4/src/protocol/extensions.cc
---- libtorrent-0.12.4.old/src/protocol/extensions.cc    2008-08-26 15:15:15.000000000 -0500
-+++ libtorrent-0.12.4/src/protocol/extensions.cc        2009-02-04 09:47:07.000000000 -0600
-@@ -36,6 +36,7 @@
-
- #include "config.h"
-
-+#include <cstdio>
- #include <limits>
- #include <sstream>
-
-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_dht.cc libtorrent-0.12.4/src/tracker/tracker_dht.cc
---- libtorrent-0.12.4.old/src/tracker/tracker_dht.cc    2008-08-26 15:18:34.000000000 -0500
-+++ libtorrent-0.12.4/src/tracker/tracker_dht.cc        2009-02-04 09:48:49.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <sstream>
-
- #include "dht/dht_router.h"
-
-diff -Nurp libtorrent-0.12.4.old/src/tracker/tracker_udp.cc  libtorrent-0.12.4/src/tracker/tracker_udp.cc
---- libtorrent-0.12.4.old/src/tracker/tracker_udp.cc    2008-05-07 07:19:13.000000000 -0500
-+++ libtorrent-0.12.4/src/tracker/tracker_udp.cc        2009-02-04 09:49:24.000000000 -0600
-@@ -36,6 +36,8 @@
-
- #include "config.h"
-
-+#include <cstdio>
-+
- #include <sigc++/adaptors/bind.h>
- #include <torrent/connection_manager.h>
-
-


More information about the SM-Commit mailing list