From 425fcf0d89c24ad0a69d4fa1279dafab2320da51 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 24 Sep 2016 22:16:53 +0200 Subject: remove obsolete packages madplay/omxplayer --- package/madplay/Makefile | 41 --------------- package/madplay/patches/patch-configure | 14 ------ package/omxplayer/Makefile | 42 ---------------- package/omxplayer/patches/patch-Makefile | 30 ----------- package/omxplayer/patches/patch-Makefile_include | 58 ---------------------- .../omxplayer/patches/patch-OMXPlayerSubtitles_cpp | 17 ------- 6 files changed, 202 deletions(-) delete mode 100644 package/madplay/Makefile delete mode 100644 package/madplay/patches/patch-configure delete mode 100644 package/omxplayer/Makefile delete mode 100644 package/omxplayer/patches/patch-Makefile delete mode 100644 package/omxplayer/patches/patch-Makefile_include delete mode 100644 package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp (limited to 'package') diff --git a/package/madplay/Makefile b/package/madplay/Makefile deleted file mode 100644 index 99cc70b24..000000000 --- a/package/madplay/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${ADK_TOPDIR}/rules.mk - -PKG_NAME:= madplay -PKG_VERSION:= 0.15.2b -PKG_RELEASE:= 2 -PKG_HASH:= 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0 -PKG_DESCR:= mpeg audio player in fixed point -PKG_SECTION:= mm/audio -PKG_DEPENDS:= libid3tag libmad alsa-lib -PKG_BUILDDEP:= libid3tag libmad alsa-lib -PKG_URL:= http://www.underbit.com/products/mad -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \ - ftp://ftp.mars.org/pub/mpeg/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE -CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \ - LIBS="-lz" \ - ac_cv_linux_vers=2 \ - td_cv_buggygetaddrinfo="no" -CONFIGURE_ARGS+= --disable-debugging \ - --disable-profiling \ - --disable-experimental \ - --without-libiconv-prefix \ - --without-libintl-prefix \ - --without-esd \ - --with-alsa - -madplay-install: - ${INSTALL_DIR} ${IDIR_MADPLAY}/usr/bin - ${INSTALL_BIN} ${WRKINST}/usr/bin/madplay ${IDIR_MADPLAY}/usr/bin/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/madplay/patches/patch-configure b/package/madplay/patches/patch-configure deleted file mode 100644 index b3d1b6c7c..000000000 --- a/package/madplay/patches/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- madplay-0.15.2b.orig/configure 2004-02-23 22:36:21.000000000 +0100 -+++ madplay-0.15.2b/configure 2011-01-21 16:04:04.644909723 +0100 -@@ -19057,10 +19057,7 @@ do - arch="$arch $1" - shift - ;; -- -fomit-frame-pointer) -- shift -- ;; -- -O*|-f*) -+ -O*) - optimize="$1" - shift - ;; diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile deleted file mode 100644 index 3c206b798..000000000 --- a/package/omxplayer/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= omxplayer -PKG_VERSION:= c5ab80828159c64a283ff69d40748923648f8a0a -PKG_RELEASE:= 1 -PKG_GIT:= hash -PKG_DESCR:= video player for raspberry pi -PKG_SECTION:= mm/video -PKG_DEPENDS:= libffmpeg bcm28xx-vc-libs bcm28xx-vc-gl-libs -PKG_DEPENDS+= zlib libdbus boost libfreetype libpcre -PKG_BUILDDEP:= ffmpeg boost bcm28xx-vc freetype pcre dbus -PKG_NEEDS:= threads rt c++ -PKG_URL:= https://github.com/popcornmix/omxplayer -PKG_SITES:= https://github.com/popcornmix/omxplayer.git - -PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OMXPLAYER,omxplayer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/freetype2 \ - -I$(STAGING_TARGET_DIR)/usr/include/dbus-1.0 \ - -I$(STAGING_TARGET_DIR)/opt/vc/include \ - -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vcos/pthreads \ - -I$(STAGING_TARGET_DIR)/opt/vc/include/interface/vmcs_host/linux -TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/opt/vc/lib - -omxplayer-install: - $(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/bin - $(INSTALL_BIN) $(WRKSRC)/omxplayer.bin \ - $(IDIR_OMXPLAYER)/usr/bin/omxplayer - $(INSTALL_DIR) $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/ - $(INSTALL_DATA) $(WRKSRC)/fonts/* \ - $(IDIR_OMXPLAYER)/usr/share/fonts/truetype/freefont/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile deleted file mode 100644 index 5f6fa2e24..000000000 --- a/package/omxplayer/patches/patch-Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a.orig/Makefile 2015-03-06 00:24:01.000000000 -0600 -+++ omxplayer-c5ab80828159c64a283ff69d40748923648f8a0a/Makefile 2015-03-06 00:52:15.283681501 -0600 -@@ -2,9 +2,9 @@ include Makefile.include - - CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST - --LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static - --INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -+INCLUDES+=-I./ -Ilinux - - DIST ?= omxplayer-dist - -@@ -79,14 +79,8 @@ ffmpeg: - make -f Makefile.ffmpeg - make -f Makefile.ffmpeg install - --dist: omxplayer.bin omxplayer.1 -+dist: omxplayer.bin - mkdir -p $(DIST)/usr/lib/omxplayer - mkdir -p $(DIST)/usr/bin -- mkdir -p $(DIST)/usr/share/doc/omxplayer -- mkdir -p $(DIST)/usr/share/man/man1 - cp omxplayer omxplayer.bin $(DIST)/usr/bin -- cp COPYING $(DIST)/usr/share/doc/omxplayer -- cp README.md $(DIST)/usr/share/doc/omxplayer/README -- cp omxplayer.1 $(DIST)/usr/share/man/man1 -- cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ - cd $(DIST); tar -czf ../$(DIST).tgz * diff --git a/package/omxplayer/patches/patch-Makefile_include b/package/omxplayer/patches/patch-Makefile_include deleted file mode 100644 index 14673c15f..000000000 --- a/package/omxplayer/patches/patch-Makefile_include +++ /dev/null @@ -1,58 +0,0 @@ ---- omxplayer-0.2.orig/Makefile.include 2013-10-11 15:17:41.000000000 +0200 -+++ omxplayer-0.2/Makefile.include 2013-10-11 15:34:42.000000000 +0200 -@@ -1,40 +1,16 @@ --USE_BUILDROOT=0 --FLOAT=hard -- --ifeq ($(USE_BUILDROOT), 1) --BUILDROOT :=/opt/xbmc-bcm/buildroot --SDKSTAGE :=$(BUILDROOT)/output/staging --TARGETFS :=$(BUILDROOT)/output/target --TOOLCHAIN :=$(BUILDROOT)/output/host/usr/ --HOST :=arm-unknown-linux-gnueabi --SYSROOT :=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot --else --BUILDROOT :=/opt/bcm-rootfs --SDKSTAGE :=/opt/bcm-rootfs --TARGETFS :=/opt/bcm-rootfs --TOOLCHAIN :=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/ --HOST :=arm-linux-gnueabihf --#SYSROOT :=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot --SYSROOT :=/opt/bcm-rootfs --endif -- - JOBS=7 -- --CFLAGS := -isystem$(PREFIX)/include --CXXFLAGS := $(CFLAGS) --CPPFLAGS := $(CFLAGS) --LDFLAGS := -L$(BUILDROOT)/lib --LD := $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT) --CC := $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT) --CXX := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) --OBJDUMP := $(TOOLCHAIN)/bin/$(HOST)-objdump --RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib --STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip --AR := $(TOOLCHAIN)/bin/$(HOST)-ar --CXXCP := $(CXX) -E --PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -- --CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog --LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build --#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 --INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include -+CFLAGS ?= -isystem$(PREFIX)/include -+CXXFLAGS ?= $(CFLAGS) -+CPPFLAGS ?= $(CFLAGS) -+LDFLAGS ?= -L$(BUILDROOT)/lib -+LD ?= $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT) -+CC ?= $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT) -+CXX ?= $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) -+OBJDUMP ?= $(TOOLCHAIN)/bin/$(HOST)-objdump -+RANLIB ?= $(TOOLCHAIN)/bin/$(HOST)-ranlib -+STRIP ?= $(TOOLCHAIN)/bin/$(HOST)-strip -+AR ?= $(TOOLCHAIN)/bin/$(HOST)-ar -+CXXCP ?= $(CXX) -E -+PATH ?= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -+INCLUDES += $(CPPFLAGS) -+CFLAGS += -mstructure-size-boundary=32 -mno-sched-prolog diff --git a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp b/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp deleted file mode 100644 index c23d1c9b3..000000000 --- a/package/omxplayer/patches/patch-OMXPlayerSubtitles_cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- omxplayer-0.2.orig/OMXPlayerSubtitles.cpp 2013-10-11 15:17:41.000000000 +0200 -+++ omxplayer-0.2/OMXPlayerSubtitles.cpp 2013-10-11 15:28:35.000000000 +0200 -@@ -43,11 +43,9 @@ OMXPlayerSubtitles::OMXPlayerSubtitles() - m_centered(), - m_ghost_box(), - m_lines(), -- m_av_clock(), --#ifndef NDEBUG -- m_open() --#endif --{} -+ m_av_clock() -+{ -+} - - OMXPlayerSubtitles::~OMXPlayerSubtitles() BOOST_NOEXCEPT - { -- cgit v1.2.3