From d9ec54fc6f4ebfd6fc30c15c28c2d893efecbf75 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 17 Nov 2023 14:20:45 -0500
Subject: [PATCH] omxplayer: remove package
deprecated by upstream in favour of improving vlc
---
srcpkgs/omxplayer | 1 +
srcpkgs/omxplayer/patches/build.patch | 53 -------------------------
srcpkgs/omxplayer/patches/no-curl.patch | 10 -----
srcpkgs/omxplayer/template | 28 -------------
srcpkgs/vlc/template | 18 +++++++--
5 files changed, 16 insertions(+), 94 deletions(-)
create mode 120000 srcpkgs/omxplayer
delete mode 100644 srcpkgs/omxplayer/patches/build.patch
delete mode 100644 srcpkgs/omxplayer/patches/no-curl.patch
delete mode 100644 srcpkgs/omxplayer/template
diff --git a/srcpkgs/omxplayer b/srcpkgs/omxplayer
new file mode 120000
index 00000000000..af7836d99cd
--- /dev/null
+++ b/srcpkgs/omxplayer
@@ -0,0 +1 @@
+vlc
\ No newline at end of file
diff --git a/srcpkgs/omxplayer/patches/build.patch b/srcpkgs/omxplayer/patches/build.patch
deleted file mode 100644
index 01c58e786ca..00000000000
--- a/srcpkgs/omxplayer/patches/build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git Makefile Makefile
-index 5f4e414..c5b33f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,10 +1,10 @@
--CFLAGS=-pipe -mfloat-abi=hard -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
-+CFLAGS=-fomit-frame-pointer -mtune=arm1176jzf-s
- 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$(SDKSTAGE)/opt/vc/lib/
--LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
-+LDFLAGS=-L$(XBPS_CROSS_BASE)/opt/vc/lib/ -Wl,-R/opt/vc/lib
-+LDFLAGS+=-lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
-
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
-+INCLUDES+=-I./ -Ilinux -I$(XBPS_CROSS_BASE)/usr/include/dbus-1.0 -I $(XBPS_CROSS_BASE)/usr/lib/dbus-1.0/include -I$(XBPS_CROSS_BASE)/usr/include/freetype2 -I$(XBPS_CROSS_BASE)/opt/vc/include -I$(XBPS_CROSS_BASE)/opt/vc/include/interface/vcos/pthreads
-
- DIST ?= omxplayer-dist
- STRIP ?= strip
-@@ -41,7 +41,7 @@ SRC= linux/XMemUtils.cpp \
-
- OBJS+=$(filter %.o,$(SRC:.cpp=.o))
-
--all: dist
-+all: omxplayer.bin omxplayer.1
-
- %.o: %.cpp
- @rm -f $@
-@@ -53,7 +53,7 @@ version:
- bash gen_version.sh > version.h
-
- omxplayer.bin: version $(OBJS)
-- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
-+ $(CXX) -o omxplayer.bin $(OBJS) $(LDFLAGS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
- $(STRIP) omxplayer.bin
-
- help.h: README.md Makefile
-@@ -94,7 +94,14 @@ dist: omxplayer.bin omxplayer.1
- cd $(DIST); tar -czf ../$(DIST).tgz *
-
- install:
-- cp -r $(DIST)/* /
-+ install -d $(DESTDIR)/usr/bin
-+ install -d $(DESTDIR)/usr/share/doc/omxplayer
-+ install -d $(DESTDIR)/usr/share/man/man1
-+ install -m755 omxplayer $(DESTDIR)/usr/bin/omxplayer-dbus
-+ install -m755 omxplayer.bin $(DESTDIR)/usr/bin/omxplayer
-+ install -m644 omxplayer.1 $(DESTDIR)/usr/share/man/man1/
-+ install -m644 README.md $(DESTDIR)/usr/share/doc/omxplayer/
-+ install -m644 COPYING $(DESTDIR)/usr/share/doc/omxplayer/
-
- uninstall:
- rm -rf /usr/bin/omxplayer
diff --git a/srcpkgs/omxplayer/patches/no-curl.patch b/srcpkgs/omxplayer/patches/no-curl.patch
deleted file mode 100644
index 522101cc4e0..00000000000
--- a/srcpkgs/omxplayer/patches/no-curl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -67,6 +67,6 @@ keys.h: README.md Makefile
-
- omxplayer.1: README.md
- sed -e '/DOWNLOADING/,/omxplayer-dist/ d; /DBUS/,$$ d' $< >MAN
-- curl -F page=@MAN http://mantastic.herokuapp.com 2>/dev/null >$@
-+ ronn -r --pipe MAN >$@
-
- clean:
diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template
deleted file mode 100644
index 9a66690c83e..00000000000
--- a/srcpkgs/omxplayer/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'omxplayer'
-pkgname=omxplayer
-version=20190102
-revision=2
-short_desc="Commandline OMX player for the Raspberry Pi"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://github.com/popcornmix/omxplayer"
-
-_commit="f06235cc9690a6d58187514452df8cf8fcdaacec"
-distfiles="$homepage/archive/$_commit.tar.gz"
-checksum=af2d9450f8947842ea8c401fe9f71eec444013ebbdee29f2ac828c9c493c1329
-
-# XXX only rpi
-archs="armv6l* armv7l*"
-build_style=gnu-makefile
-hostmakedepends="ruby-ronn pkg-config"
-makedepends="alsa-lib-devel rpi-userland-devel pcre-devel boost-devel freetype-devel ffmpeg-devel dbus-devel"
-depends="freefont-ttf"
-
-do_build() {
- sed -e 's,/usr/share/fonts/truetype/freefont,/usr/share/fonts/TTF,g' -i omxplayer.cpp
- mkdir -p /opt/vc/lib
- make CC=$CC XBPS_CROSS_BASE=$XBPS_CROSS_BASE ${makejobs}
-}
-post_install() {
- sed -i 's,omxplayer.bin,omxplayer,g' ${DESTDIR}/usr/bin/omxplayer-dbus
-}
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index abc5eeba015..fa46c57cba2 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.20
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -50,6 +50,8 @@ make_check=ci-skip
build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
build_options_default="lua smb v4l2 x265 sndio chromecast qt"
+subpackages="libvlc vlc-devel"
+
CFLAGS="-fcommon"
CXXFLAGS="-fcommon"
@@ -63,7 +65,12 @@ case "$XBPS_TARGET_MACHINE" in
configure_args+=" --disable-altivec"
build_options_default+=" opengl"
;;
- armv[67]*|aarch64*)
+ armv[67]*)
+ # XXX only for rpi
+ build_options_default+=" rpi"
+ subpackages+=" omxplayer"
+ ;;
+ aarch64*)
# XXX only for rpi
build_options_default+=" rpi"
;;
@@ -75,7 +82,6 @@ fi
if [ "$build_option_rpi" ]; then
configure_args+=" --enable-omxil --enable-omxil-vout --enable-rpi-omxil"
- makedepends+=" rpi-userland-devel"
fi
pre_configure() {
@@ -126,3 +132,9 @@ vlc-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+omxplayer_package() {
+ short_desc+="Commandline OMX player for the Raspberry Pi (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+}