Hi, I tried to upgrade the packaged mplayer in openwrt-packages.git to a more recent version from SVN. Mplayer project doesn't seem to do any 'release' tarballs any more, but point to their SVN repositoy instead.
However, I ran into multiple problems. Revisions > 32225 won't work with external ffmpeg but attempt to do a local git-checkout during ./configure, later compile and statically link it. Yuck. Revisions <= 32225 somewhat compile, see the attached patch. However, they need libavutil, which seems to not be compiled/installed by the ffmpeg package that comes from the openwrt feeds. So linking currently fails. Any ideas how to proceed? cheers, David -- GnuPG public key: http://user.cs.tu-berlin.de/~dvdkhlng/dk.gpg Fingerprint: B17A DC95 D293 657B 4205 D016 7DEF 5323 C174 7D40
diff --git a/mplayer/Makefile b/mplayer/Makefile index 26b1aaf..fe37cb3 100644 --- a/mplayer/Makefile +++ b/mplayer/Makefile @@ -7,12 +7,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=MPlayer -PKG_VERSION:=1.0rc3 -PKG_RELEASE:=2 +# newer mplayer revisions lack the --enable-system-ffmpeg configure option +# which totally screws us :( (i.e. they want to checkout and rebuild libffmpeg +# from the mplayer source tree, yuck!) +PKG_REV:=32225 +#225 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.mplayerhq.hu/MPlayer/releases/ -PKG_MD5SUM:=0191ddb9c21620779838e53a4cca5ac1 +PKG_SOURCE=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=svn://svn.mplayerhq.hu/mplayer/trunk +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -22,7 +29,7 @@ define Package/MPlayer CATEGORY:=Multimedia TITLE:=MPlayer, the movie player URL:=http://www.mplayerhq.hu - DEPENDS:=+libjpeg +libpng +directfb +zlib +libsdl +libfreetype +fontconfig $(ICONV_DEPENDS) +BUILD_PATENTED:libmad +libaa +giflib +fribidi +libtheora + DEPENDS:=+libffmpeg +libjpeg +libpng +directfb +zlib +libsdl +libfreetype +fontconfig $(ICONV_DEPENDS) +BUILD_PATENTED:libmad +libaa +giflib +fribidi +libtheora +libggi endef define Package/MPlayer/description @@ -32,6 +39,8 @@ endef CONFIGURE_ARGS := --target=mips \ --disable-mencoder \ --disable-pthreads \ + --enable-system-ffmpeg \ + --extra-libs="-lavformat -lavcodec -lavutil -lpostproc -lswscale" \ --enable-cross-compile \ --prefix=/usr \ --with-sdl-config=$(STAGING_DIR)/usr/bin/sdl-config \ @@ -56,9 +65,18 @@ CONFIGURE_ARGS := --target=mips \ --disable-vidix-pcidb \ --with-vidix-drivers="no" +# mplayer makefile is soooo broken. have to specify libs by hand, if +# compileing with --enable-system-ffmpeg +TARGET_CFLAGS+= -std=c99 -DPATH_MAX=512 -D_GNU_SOURCE +# -lavcore + # todo: remove once building correctly MAKE_FLAGS = -j4 +define Build/Configure + $(call Build/Configure/Default,) +endef + define Package/MPlayer/install $(INSTALL_DIR) \ $(1)/usr/bin \
pgp76v5cyomQU.pgp
Description: PGP signature
_______________________________________________ Qi Hardware Discussion List Mail to list (members only): [email protected] Subscribe or Unsubscribe: http://lists.en.qi-hardware.com/mailman/listinfo/discussion
