From 3ed2da31fcdd1b03eee249700cb966cc33919510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Tue, 2 Aug 2005 16:53:43 +0000 Subject: [PATCH] * packages.mak: Updated the download server of libopendaap and the used version. 0.4.0 is entirely free on the contrary to previous versions, since it uses a free mdns-library instead of Apple's own now. * Makefile: - Our patch was applied upstream, so we don't need it anymore. - Fixed a copy&paste typo, which prevented the dist-clean of 9 libraries --- extras/contrib/src/Makefile | 19 +++++++++---------- extras/contrib/src/Patches/daap.patch | 11 ----------- extras/contrib/src/packages.mak | 4 ++-- 3 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 extras/contrib/src/Patches/daap.patch diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 781dfb8463..e0e4dd8a25 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -1072,7 +1072,7 @@ libpng: libpng-$(PNG_VERSION).tar.bz2 CLEAN_FILE += .png CLEAN_PKG += libpng -DISCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2 +DISTCLEAN_PKG += libpng-$(PNG_VERSION).tar.bz2 # *************************************************************************** # libzvbi @@ -1090,7 +1090,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 CLEAN_FILE += .zvbi CLEAN_PKG += zvbi -DISCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 +DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2 # *************************************************************************** # gpg-error @@ -1109,7 +1109,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz CLEAN_FILE += .gpg-error CLEAN_PKG += libgpg-error -DISCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz +DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz # *************************************************************************** # libgcrypt @@ -1129,7 +1129,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.gz CLEAN_FILE += .gcrypt CLEAN_PKG += libgcrypt -DISCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz +DISTCLEAN_PKG += libgcrypt-$(GCRYPT_VERSION).tar.gz # *************************************************************************** # gnutls @@ -1148,7 +1148,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2 CLEAN_FILE += .gnutls CLEAN_PKG += gnutls -DISCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2 +DISTCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2 # *************************************************************************** # libopendaap @@ -1159,7 +1159,6 @@ libopendaap-$(DAAP_VERSION).tar.bz2: libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2 $(EXTRACT_BZ2) - patch -p 0 < Patches/daap.patch .daap: libopendaap (cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install ) @@ -1167,7 +1166,7 @@ libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2 CLEAN_FILE += .daap CLEAN_PKG += libopendaap -DISCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2 +DISTCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2 # *************************************************************************** # glib @@ -1185,7 +1184,7 @@ glib: glib-$(GLIB_VERSION).tar.gz CLEAN_FILE += .glibl CLEAN_PKG += glib -DISCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz +DISTCLEAN_PKG += glib-$(GLIB_VERSION).tar.gz # *************************************************************************** # libIDL @@ -1203,7 +1202,7 @@ libIDL: libIDL-$(LIBIDL_VERSION).tar.gz CLEAN_FILE += .libidl CLEAN_PKG += libIDL -DISCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz +DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz # *************************************************************************** # mozilla @@ -1221,7 +1220,7 @@ mozilla: mozilla-source-$(MOZILLA_VERSION).tar.bz2 CLEAN_FILE += .mozilla CLEAN_PKG += mozilla -DISCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 +DISTCLEAN_PKG += mozilla-source-$(MOZILLA_VERSION).tar.bz2 # *************************************************************************** # Copy aclocal files diff --git a/extras/contrib/src/Patches/daap.patch b/extras/contrib/src/Patches/daap.patch deleted file mode 100644 index cca2526a71..0000000000 --- a/extras/contrib/src/Patches/daap.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN libopendaap.orig/http_client.c libopendaap/http_client.c ---- libopendaap.orig/http_client.c Mon Jan 17 15:36:28 2005 -+++ libopendaap/http_client.c Mon Jan 17 15:37:01 2005 -@@ -36,6 +36,7 @@ - # include - # include - # include -+# include - # include - # include - #elif defined(SYSTEM_WIN32) diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index 509cb461b2..e663257e90 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -117,8 +117,8 @@ GCRYPT_VERSION=1.2.0 GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.gz GNUTLS_VERSION=1.2.6 GNUTLS_URL=ftp://ftp.gnutls.org/pub/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2 -DAAP_VERSION=0.3.0 -DAAP_URL=http://crazney.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2 +DAAP_VERSION=0.4.0 +DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2 GLIB_VERSION=1.2.8 GLIB_URL=ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.8.tar.gz LIBIDL_VERSION=0.6.8