From 6d9c9a3eed574c29368efb644e76fadd5c2a9fd5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 16:01:43 +0100 Subject: fix build on cygwin --- package/digitemp/Makefile | 2 +- package/digitemp/patches/patch-Makefile | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index a03d7e1f1..fab6e8d79 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 PKG_BUILDDEP+= libusb libusb-compat PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 -PKG_DESCR:= simple to use program for reading values from 1-wire devices +PKG_DESCR:= simple program for reading values from 1-wire devices PKG_SECTION:= misc PKG_DEPENDS:= libusb PKG_URL:= http://www.digitemp.com/software/linux diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile index 10ac0c97f..4f19aaae2 100644 --- a/package/digitemp/patches/patch-Makefile +++ b/package/digitemp/patches/patch-Makefile @@ -1,6 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +do not use static linking on Cygwin --- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 -+++ digitemp-3.6.0/Makefile 2009-06-01 20:04:20.000000000 +0200 ++++ digitemp-3.6.0/Makefile 2010-01-06 19:12:56.868375000 +0100 @@ -11,8 +11,8 @@ VERSION = 3.6.0 @@ -12,3 +12,11 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ OBJS = src/digitemp.o src/device_name.o src/ds2438.o HDRS = src/digitemp.h src/device_name.h +@@ -57,7 +57,6 @@ endif + + ifneq (, $(findstring CYGWIN,$(SYSTYPE))) + CFLAGS += -DCYGWIN +- LIBS += -static -static-libgcc + endif + + ifeq ($(SYSTYPE), SunOS) -- cgit v1.2.3 From 14dae150926ddceb74579a72b77c9c003f595a80 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 16:02:36 +0100 Subject: update to latest upstream version --- package/git/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/git/Makefile b/package/git/Makefile index da9896e51..2a6951c1c 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.6.5.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 50fb736021ef89916af622cb4772bbea +PKG_VERSION:= 1.6.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 08af805fd59f68d9ad00a2f878cf820e PKG_DESCR:= fast version control system PKG_SECTION:= misc PKG_DEPENDS:= libopenssl libcurl libexpat -- cgit v1.2.3 From 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 16:02:36 +0100 Subject: fix build on Cygwin --- package/ffmpeg/patches/patch-configure | 11 ++++++++++- package/file/Makefile | 4 ++-- package/flac/patches/patch-src_Makefile_in | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 package/flac/patches/patch-src_Makefile_in diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure index d23a61e52..5ff0e14c8 100644 --- a/package/ffmpeg/patches/patch-configure +++ b/package/ffmpeg/patches/patch-configure @@ -1,5 +1,14 @@ --- ffmpeg-0.5.orig/configure 2009-03-01 18:57:14.000000000 +0100 -+++ ffmpeg-0.5/configure 2009-06-12 23:27:05.000000000 +0200 ++++ ffmpeg-0.5/configure 2010-01-06 20:34:48.343750000 +0100 +@@ -1167,7 +1167,7 @@ arch=`uname -m` + cpu="generic" + + # OS +-target_os=$(tolower $(uname -s)) ++target_os=linux + + # configurable options + enable debug @@ -2486,51 +2486,6 @@ cmp -s $TMPH config.h && rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH diff --git a/package/file/Makefile b/package/file/Makefile index 25b371d6e..58650bb0f 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -23,10 +23,10 @@ INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - CFLAGS="-static" ./configure --enable-static --disable-shared \ + ./configure \ ); ${MAKE} -C ${WRKBUILD} - ${INSTALL_BIN} ${WRKBUILD}/src/file ${STAGING_TOOLS}/bin + ${INSTALL_BIN} ${WRKBUILD}/src/.libs/file ${STAGING_TOOLS}/bin ${MAKE} -C ${WRKBUILD} clean post-install: diff --git a/package/flac/patches/patch-src_Makefile_in b/package/flac/patches/patch-src_Makefile_in new file mode 100644 index 000000000..026228d7a --- /dev/null +++ b/package/flac/patches/patch-src_Makefile_in @@ -0,0 +1,20 @@ +--- flac-1.2.1.orig/src/Makefile.in 2007-09-16 22:05:09.000000000 +0200 ++++ flac-1.2.1/src/Makefile.in 2010-01-06 21:10:24.984375000 +0100 +@@ -226,8 +226,6 @@ target_alias = @target_alias@ + SUBDIRS = \ + libFLAC \ + share \ +- flac \ +- metaflac \ + monkeys_audio_utilities \ + $(XMMS_DIRS) \ + plugin_winamp2 \ +@@ -255,7 +253,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \ ++DIST_SUBDIRS = libFLAC share monkeys_audio_utilities \ + plugin_common plugin_xmms plugin_winamp2 test_grabbag \ + test_libs_common test_libFLAC test_seeking test_streams \ + libFLAC++ test_libFLAC++ -- cgit v1.2.3 From 3e20863932163c8324bd0303546e21c4c9059501 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 16:47:25 +0100 Subject: update alsa packages --- package/alsa-lib/Makefile | 4 ++-- package/alsa-utils/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index 78d0b08df..219564ab3 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.0.21a +PKG_VERSION:= 1.0.22 PKG_RELEASE:= 1 -PKG_MD5SUM:= 914685deb8c23cb4b940a4173cf8efe4 +PKG_MD5SUM:= b28a12348905fb6915bc41f0edb2ecce PKG_DESCR:= ALSA sound library PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index e2261ff1c..8da03270a 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils -PKG_VERSION:= 1.0.21 +PKG_VERSION:= 1.0.22 PKG_RELEASE:= 1 -PKG_BUILDDEP+= alsa-lib -PKG_MD5SUM:= 3672287c2608040d111ce45495ba7602 +PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility -PKG_DEPENDS:= alsa-lib libpthread PKG_SECTION:= utils +PKG_DEPENDS:= alsa-lib libpthread +PKG_BUILDDEP+= alsa-lib PKG_URL:= http://www.alsa-project.org PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ ftp://ftp.alsa-project.org/pub/utils/ -- cgit v1.2.3 From 940a3a2497867e7fb2044a437175619b65f04334 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 16:47:39 +0100 Subject: fix libshout build dependency --- package/mpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index f70e6652a..57918dd15 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -33,7 +33,7 @@ ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),) PKG_BUILDDEP+= libaudiofile endif ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),) -PKG_BUILDDEP+= lame libvorbis +PKG_BUILDDEP+= lame libvorbis libshout endif ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),) PKG_BUILDDEP+= curl -- cgit v1.2.3