main/omxplayer: move from testing, refresh snapshot

3 files changed, 0 insertions, 111 deletions

diff --git a/testing/omxplayer/APKBUILD b/testing/omxplayer/APKBUILD
deleted file mode 100644
index 46adaad9e..000000000
--- a/testing/omxplayer/APKBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
-pkgname=omxplayer
-pkgver=0.20140922
-_commitid=6ee9a0a5488119786990b6f91990d59d6e35427c
-pkgrel=0
-pkgdesc="Commandline OMX player for Raspberry Pi"
-url="https://github.com/popcornmix/omxplayer"
-arch="armhf"
-license="GPLv2"
-depends="ttf-dejavu"
-makedepends="raspberrypi-dev ffmpeg-dev pcre-dev boost-dev freetype-dev dbus-dev"
-install=""
-subpackages="$pkgname-doc"
-source="omxplayer-$pkgver.tar.gz::https://github.com/popcornmix/omxplayer/archive/$_commitid.tar.gz
-	fix-makefile.patch
-	default-font.patch
-	"
-
-_srcdir="$srcdir"/$pkgname-$_commitid
-
-prepare() {
-	local i
-	cd "$_srcdir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_srcdir"
-	cat <<EOF > Makefile.include
-INCLUDES:=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux
-INCLUDES+=$(pkg-config --cflags freetype2 dbus-1)
-LDFLAGS:=-L/opt/vc/lib -Wl,-rpath,/opt/vc/lib
-LDFLAGS+=$(pkg-config --libs freetype2 dbus-1)
-STRIP:=/usr/bin/strip
-EOF
-	make omxplayer.bin omxplayer.1
-}
-
-package() {
-	cd "$_srcdir"
-	make install DIST="$pkgdir" || return 1
-	rm -rf "$pkgdir"/usr/lib/omxplayer
-}
-
-md5sums="abaf77da1d74cc7147291b1167ccc3da  omxplayer-0.20140922.tar.gz
-d8f335e1dff4b34faf36c25ad2c2b881  fix-makefile.patch
-79197742a37d4493e1224675c6803eba  default-font.patch"
-sha256sums="31dd025e169857436ab2bad36322c259f96814144c5d94321c0096078282965e  omxplayer-0.20140922.tar.gz
-799b0aba6aef8c665a685777cd912268315309d0d74ce76be5fdfd0dcffbb422  fix-makefile.patch
-0d283b33189d6dc4d3a576f6ac2a0ab1285b86a04be555efc139a9296df91631  default-font.patch"
-sha512sums="94fb58cbaa67ac0aaf60b0439a216553b03f4c8be5d053f926e50e94ae723bcb717737b9fdafdaed6b9cf66d603359e67e8c5ca888ebe82438cde396253fcde3  omxplayer-0.20140922.tar.gz
-3210242f9b834ffec9d3077d5a25caf8be84aa7f4f13c73eb7f61c0a406ec787e4055951fc5a6236f1da7897c95db94a5e11e25d1b3e859a6ea67f31fc6eb517  fix-makefile.patch
-70762237e6f6d810da91f8ec46bcc68310d8ff44c6d103c0a77a7c4f6f6a39b1e6440a74799490b0e27a8e50848300a12f701850c3c3475c5497d33802304d0f  default-font.patch"
diff --git a/testing/omxplayer/default-font.patch b/testing/omxplayer/default-font.patch
deleted file mode 100644
index f5cf99cf8..000000000
--- a/testing/omxplayer/default-font.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98.orig/omxplayer.cpp
-+++ omxplayer-7af21f596378e5efeceebedff9c4a298e2d06d98/omxplayer.cpp
-@@ -88,8 +88,8 @@
- bool              m_osd                 = true;
- std::string       m_external_subtitles_path;
- bool              m_has_external_subtitles = false;
--std::string       m_font_path           = "/usr/share/fonts/truetype/freefont/FreeSans.ttf";
--std::string       m_italic_font_path    = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf";
-+std::string       m_font_path           = "/usr/share/fonts/TTF/DejaVuSans.ttf";
-+std::string       m_italic_font_path    = "/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf";
- std::string       m_dbus_name           = "org.mpris.MediaPlayer2.omxplayer";
- bool              m_asked_for_font      = false;
- bool              m_asked_for_italic_font = false;
---- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/README.md.orig
-+++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/README.md
-@@ -80,8 +80,8 @@
-         --no-osd                Do not display status information on screen
-         --no-keys               Disable keyboard input (prevents hangs for certain TTYs)
-         --subtitles path        External subtitles in UTF-8 srt format
--        --font path             Default: /usr/share/fonts/truetype/freefont/FreeSans.ttf
--        --italic-font path      Default: /usr/share/fonts/truetype/freefont/FreeSansOblique.ttf
-+        --font path             Default: /usr/share/fonts/TTF/FreeSans.ttf
-+        --italic-font path      Default: /usr/share/fonts/TTF/FreeSansOblique.ttf
-         --font-size size        Font size in 1/1000 screen height (default: 55)
-         --align left/center     Subtitle alignment (default: left)
-         --no-ghost-box          No semitransparent boxes behind subtitles
diff --git a/testing/omxplayer/fix-makefile.patch b/testing/omxplayer/fix-makefile.patch
deleted file mode 100644
index 96d57a262..000000000
--- a/testing/omxplayer/fix-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile.orig
-+++ omxplayer-6ee9a0a5488119786990b6f91990d59d6e35427c/Makefile
-@@ -48,7 +48,7 @@
- omxplayer.o: help.h keys.h
- 
- version:
--	bash gen_version.sh > version.h 
-+	sh gen_version.sh > version.h 
- 
- omxplayer.bin: version $(OBJS)
- 	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
-@@ -79,14 +79,12 @@
- 	make -f Makefile.ffmpeg
- 	make -f Makefile.ffmpeg install
- 
--dist: omxplayer.bin omxplayer.1
-+install: omxplayer.bin omxplayer.1
- 	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 omxplayer.bin $(DIST)/usr/bin/omxplayer
- 	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 *