diff options
| -rw-r--r-- | linhes/calamares/.gitignore | 1 | ||||
| -rw-r--r-- | linhes/calamares/PKGBUILD | 3 | ||||
| -rw-r--r-- | linhes/calamares/__changelog | 1 | ||||
| -rw-r--r-- | linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 | 5 | ||||
| -rw-r--r-- | linhes/linhes-dev/PKGBUILD | 2 | ||||
| -rw-r--r-- | linhes/mythtv/PKGBUILD | 51 | ||||
| -rw-r--r-- | linhes/mythtv/mythfrontend.desktop | 2 | ||||
| -rw-r--r-- | linhes/mythtv/mythtv-setup.desktop | 4 |
8 files changed, 22 insertions, 47 deletions
diff --git a/linhes/calamares/.gitignore b/linhes/calamares/.gitignore index 018a3de..8f67b8b 100644 --- a/linhes/calamares/.gitignore +++ b/linhes/calamares/.gitignore @@ -2,3 +2,4 @@ !PKGBUILD !.SRCINFO !.gitignore +!__changelog diff --git a/linhes/calamares/PKGBUILD b/linhes/calamares/PKGBUILD index a44ce55..3a9f168 100644 --- a/linhes/calamares/PKGBUILD +++ b/linhes/calamares/PKGBUILD @@ -4,7 +4,7 @@ _pkgname="calamares" pkgname="$_pkgname" pkgver=3.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Distribution-independent installer framework" url="https://codeberg.org/Calamares/calamares" license=("GPL-3.0-or-later") @@ -14,6 +14,7 @@ depends=( 'kcoreaddons' 'kpmcore' 'libpwquality' + 'python' 'qt6-declarative' 'qt6-svg' 'yaml-cpp' diff --git a/linhes/calamares/__changelog b/linhes/calamares/__changelog new file mode 100644 index 0000000..3121e04 --- /dev/null +++ b/linhes/calamares/__changelog @@ -0,0 +1 @@ +PKGBUILD: add python as dep so modules all get built diff --git a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 index b29f66d..02e2cd2 100644 --- a/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 +++ b/linhes/linhes-dev/LinHES9_iso/cust_skel/packages.x86_64 @@ -29,7 +29,7 @@ exfatprogs f2fs-tools fatresize #fsarchiver -gnu-netcat +openbsd-netcat gpart gpm gptfdisk @@ -91,7 +91,6 @@ pv qemu-guest-agent refind reflector -reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo @@ -141,7 +140,7 @@ wireplumber xdg-user-dirs xf86-video-fbdev xf86-video-vesa -xf86-video-vmware +#xf86-video-vmware xorg-server #################### # XFCE # diff --git a/linhes/linhes-dev/PKGBUILD b/linhes/linhes-dev/PKGBUILD index 5033678..efd182b 100644 --- a/linhes/linhes-dev/PKGBUILD +++ b/linhes/linhes-dev/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-dev pkgver=9.0.0 -pkgrel=17 +pkgrel=18 pkgdesc="Scripts to develop LinHES" arch=('x86_64') license=('GPL2') diff --git a/linhes/mythtv/PKGBUILD b/linhes/mythtv/PKGBUILD index 1803afa..b5046fa 100644 --- a/linhes/mythtv/PKGBUILD +++ b/linhes/mythtv/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: James Bunton <jamesbunton@delx.net.au> +# Maintainer: John Bergqvist <johnlbergqvist@gmail.com> +# Contributor: James Bunton <jamesbunton@delx.net.au> # Contributor: Taijian <taijian@posteo.de> # Contributor: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -7,9 +8,10 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=36+fixes.20260310.ababe58b -pkgrel=2 +pkgver=36+fixes.20260410.0fb9e4f3 +pkgrel=4 pkgdesc="A Homebrew PVR project" +_mythversion=36 arch=('x86_64') url="https://www.mythtv.org/" license=('GPL') @@ -17,7 +19,6 @@ depends=( 'aom' 'dav1d' 'exiv2' - 'fftw' 'lame' 'libass' 'libavc1394' @@ -33,14 +34,12 @@ depends=( 'libxml2' 'libxrandr' 'libzip' - 'lzo' 'qt5-script' # 'qt6-base' 'soundtouch' 'taglib' 'x264' 'x265' - 'glew' 'libcec' 'mariadb' 'mariadb-clients' @@ -62,30 +61,14 @@ depends=( ) makedepends=( 'git' - 'help2man' 'libcdio' - 'libcec' 'libmariadbclient' - 'libxml2' 'lirc' 'nasm' - 'perl-dbd-mysql' - 'perl-io-socket-inet6' - 'perl-libwww' - 'perl-net-upnp' - 'perl-xml-simple' - 'perl-xml-xpath' - 'python-lxml' - 'python-mysqlclient' 'python-pip' - 'python-pyqt5-webengine' -# 'python-pyqt6-webengine' - 'python-requests' 'python-setuptools' - 'python-simplejson' -# 'python-wheel' + 'python-wheel' 'qt5-tools' - 'yasm' ) options=(!lto) @@ -98,7 +81,7 @@ patches="defaultThemeLinHES.patch # 0031-UPnP-Reduce-startup-latency-by-moving-blocking-code-to-own-thread.patch source=( - "git+https://github.com/MythTV/mythtv#branch=fixes/36" + "git+https://github.com/MythTV/mythtv#branch=fixes/${_mythversion}" 'mythbackend.service' 'mythfrontend.desktop' 'mythtv-setup.desktop' @@ -110,8 +93,8 @@ source=( sha256sums=('SKIP' '6adb9d3370111c7d0000b215ae2d83a07a19c1bef5c22657f8caa9593c8efda5' - 'eb355b20d9d36a2942bb529263b9e16da30ef764f80acac0177b1773a6b3c809' - '23b9669ea7533c13c54b382fba7b63980064939d5701a0c229c9254bafd6d3d6' + '1d989fa50c7c3b45b1aa2bdbb5dc6e446485004afb81c65b4b5be1dc85d4bc5f' + '2f58fc3e30723d2bc1685dc2c6301373cc2f070588ce8865b0d4907d8cd6a436' '12cb52bf9b084a4f16419c9370fef0450ce6a11308b0c3f7240f4f83df7e2ab6' 'ecfd02bbbef5de9773f4de2c52e9b2b382ce8137735f249d7900270d304fd333' '470de0a4050c16c7af11a0e5cfe2810b7daae42df4acf5456c7eae274dc7c5ae' @@ -122,7 +105,7 @@ sha256sums=('SKIP' prepare() { msg2 "PKGBUILD pkgver: $pkgver" cd "${srcdir}/mythtv/mythtv" - gitsrcver=`echo "36+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"` + gitsrcver=`echo "${_mythversion}+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"` msg2 "GIT SOURCE pkgver: $gitsrcver" if [ $pkgver = $gitsrcver ]; then warning "pkgver did NOT change. Consider increasing pkgrel ($pkgrel)." @@ -143,25 +126,15 @@ prepare() { pkgver() { cd "${srcdir}/mythtv/mythtv" - echo -n "36+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)" + echo -n "${_mythversion}+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)" } build() { cd "${srcdir}/mythtv/mythtv" -#CFLAGS="-march=x86-64 -mtune=amdfam10 -O2 -pipe -fno-plt -fexceptions \ -# -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -# -fstack-clash-protection -fcf-protection" -# CFLAGS="${CFLAGS/flto=auto/fPIC}" -# CXXFLAGS="${CXXFLAGS/flto=auto/fPIC}" -# LDFLAGS="${LDFLAGS/flto=auto/fPIC}" - ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ - --disable-altivec \ - --disable-audio-jack \ - --disable-distcc \ --enable-libaom \ --enable-libdav1d \ --enable-libmp3lame \ @@ -169,10 +142,10 @@ build() { --enable-libx264 \ --enable-libx265 \ --enable-libxvid \ - --enable-vaapi \ --with-bindings=python \ --with-bindings=perl \ --perl-config-opts=INSTALLDIRS=vendor + echo "###### STARTING MAKE ####" make } diff --git a/linhes/mythtv/mythfrontend.desktop b/linhes/mythtv/mythfrontend.desktop index 3de9419..65e725f 100644 --- a/linhes/mythtv/mythfrontend.desktop +++ b/linhes/mythtv/mythfrontend.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=MythFrontend -Comment=Record, playback and watch TV. +Comment=Record, playback and watch TV Exec=mythfrontend --disable-autodiscovery --noupnp --quiet --syslog local6 Type=Application Terminal=false diff --git a/linhes/mythtv/mythtv-setup.desktop b/linhes/mythtv/mythtv-setup.desktop index d238af1..cb17121 100644 --- a/linhes/mythtv/mythtv-setup.desktop +++ b/linhes/mythtv/mythtv-setup.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=MythTV Setup -Comment=Setup application for the MythTV backend server -Exec=Exec=mythtv-setup --syslog local6 +Comment=Setup the MythTV backend server +Exec=mythtv-setup --syslog local6 Type=Application Terminal=false Icon=mythtv |