[vlc-commits] twolame: remove extra header download

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Mon Jul 27 12:02:22 2015 -0400| [46d89811bcf0266ca83b7319dd399b903da55e32] | committer: Jean-Baptiste Kempf

twolame: remove extra header download

The changes have already been merged into 0.3.13.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 130da2a0256bc032a7f96d446f72a69d5d33867d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=46d89811bcf0266ca83b7319dd399b903da55e32
---

 contrib/src/twolame/SHA512SUMS |    1 -
 contrib/src/twolame/rules.mak  |   10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/contrib/src/twolame/SHA512SUMS b/contrib/src/twolame/SHA512SUMS
index 49a5fe9..18b339d 100644
--- a/contrib/src/twolame/SHA512SUMS
+++ b/contrib/src/twolame/SHA512SUMS
@@ -1,2 +1 @@
 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7  twolame-0.3.13.tar.gz
-d19263c9c8fddca7bfd306c07d45fb649e29f9c3c978b9dd2c70d122bc335a569228cc0961b1a15162b2ab9e44a1595ea107ac359ea08a8256fe780d8f173e8d  twolame-winutil.h
diff --git a/contrib/src/twolame/rules.mak b/contrib/src/twolame/rules.mak
index 345bc23..7f3756d 100644
--- a/contrib/src/twolame/rules.mak
+++ b/contrib/src/twolame/rules.mak
@@ -13,16 +13,10 @@ endif
 $(TARBALLS)/twolame-$(TWOLAME_VERSION).tar.gz:
 	$(call download,$(TWOLAME_URL))
 
-$(TARBALLS)/twolame-winutil.h:
-	$(call download,"http://twolame.svn.sourceforge.net/viewvc/*checkout*/twolame/trunk/win32/winutil.h")
+.sum-twolame: twolame-$(TWOLAME_VERSION).tar.gz
 
-.sum-twolame: twolame-$(TWOLAME_VERSION).tar.gz twolame-winutil.h
-
-twolame: twolame-$(TWOLAME_VERSION).tar.gz twolame-winutil.h .sum-twolame
+twolame: twolame-$(TWOLAME_VERSION).tar.gz .sum-twolame
 	$(UNPACK)
-ifdef HAVE_WIN32
-	cp -f $(filter %winutil.h,$^) $@-$(TWOLAME_VERSION)/win32/winutil.h
-endif
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && cp config.guess config.sub build-scripts
 	$(MOVE)