Waldemar Brodkorb 14 роки тому
батько
коміт
77bdac14df

+ 10 - 1
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

+ 2 - 2
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:

+ 20 - 0
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++