Browse Source

update ffmpeg to latest stable version, enable more subpackages

Waldemar Brodkorb 12 năm trước cách đây
mục cha
commit
418d5b8ac1
4 tập tin đã thay đổi với 5 bổ sung7 xóa
  1. 1 3
      package/forked-daapd/Makefile
  2. 1 1
      package/moc/Makefile
  3. 2 2
      package/mpd/Makefile
  4. 1 1
      package/vlc/Makefile

+ 1 - 3
package/forked-daapd/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b45aab5b60382ec3ada7e71cb1356b1d
 PKG_DESCR:=		DAAPD server
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libunistring zlib libconfuse sqlite ffmpeg libgcrypt
+PKG_DEPENDS:=		libunistring zlib libconfuse sqlite libffmpeg libgcrypt
 PKG_DEPENDS+=		libavahi libmxml libevent libavl libantlr3c alsa-lib
 PKG_DEPENDS+=		libsqlite libintl dbus
 PKG_BUILDDEP:=		libunistring zlib confuse avahi sqlite ffmpeg dbus
@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#TARGET_LDFLAGS+=		-lgcc
-
 forked-daapd-install:
 	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc
 	$(CP) ./files/forked-daapd.conf \

+ 1 - 1
package/moc/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2dd0cb6481d77fda09c58ec3154a21c0
 PKG_DESCR:=		console music player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv
+PKG_DEPENDS:=		libmad libvorbis libcurl libflac libffmpeg libiconv
 PKG_DEPENDS+=		libncurses libid3tag
 PKG_BUILDDEP:=		ncurses libvorbis curl libmad flac ffmpeg libiconv
 PKG_BUILDDEP+=		libid3tag

+ 2 - 2
package/mpd/Makefile

@@ -74,10 +74,10 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_MMS),y)
 PKG_FDEPENDS+=		libmms
 endif
 PKGFD_WITH_FFMPEG:=	enable FFMPEG support
-PKGFS_WITH_FFMPEG:=	ffmpeg
+PKGFS_WITH_FFMPEG:=	libffmpeg
 PKGFB_WITH_FFMPEG:=	ffmpeg
 ifeq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),y)
-PKG_FDEPENDS+=		ffmpeg
+PKG_FDEPENDS+=		libffmpeg
 endif
 PKGFD_WITH_SHOUT:=	enable Shoutcast output support
 PKGFS_WITH_SHOUT:=	libshout liblame libvorbisenc

+ 1 - 1
package/vlc/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		a64846d6f21ea179ae8e8bfb6f9447fe
 PKG_DESCR:=		Media Player
 PKG_SECTION:=		multimedia
 PKG_BUILDDEP:=		ffmpeg xcb-util
-PKG_DEPENDS:=		ffmpeg xcb-util
+PKG_DEPENDS:=		libffmpeg xcb-util
 PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}