SQUASH: bump pkgrels

pmos-ui-gnome: add some useful pkgs to pmb_recmds, drop riscv64
gnome-calendar is unavailable on riscv64, so support for that arch is dropped until someone is able to resolve that. IMHO this is an ok trade-off since I don't think many folks are running gnome desktop on riscv64 (yet?) and gnome-calendar is probably useful for more folks to have by default.
2024-01-26 18:11:11 -08:00 · 2024-01-26 18:11:11 -08:00 · 2024-01-26 18:11:11 -08:00 · 2024-01-26 18:11:11 -08:00 · 2024-01-26 18:11:11 -08:00 · 2024-01-26 18:11:11 -08:00
9 changed files with 109 additions and 46 deletions
@@ -1,8 +1,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=10
-pkgrel=1
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -22,6 +22,9 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-kernel-lts:kernel_lts
 	$pkgname-mesa
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-amd:nonfree_firmware_amd
+	$pkgname-nonfree-firmware-intel:nonfree_firmware_intel
 "
 _pmb_recommends="
 	oem-intel
@@ -62,6 +65,26 @@ kernel_lts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }

+nonfree_firmware() {
+	pkgdesc="Firmware for x86_64 devices"
+
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_amd() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-amd"
+	depends="oem-amd-nonfree-firmware"
+
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_intel() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel oem-intel"
+	depends="oem-intel-nonfree-firmware"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
 7e968698e54583023cc73a9dec0c15ef91d6eb24ad31f0ce531a6eada0ff2dceb22c9edc443bf7cef362a9a5b23ea95d698c217e1f780495029f4a5451ed2882  modules-initfs
@@ -1,8 +1,8 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-valve-jupiter
 pkgdesc="Valve Steam Deck"
-pkgver=0.3
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	linux-edge
 	linux-firmware-none
+	oem-amd
 	postmarketos-base
 	systemd-boot
 	"
@@ -40,10 +41,10 @@ package() {
 nonfree_firmware() {
 	pkgdesc="Firmware for the Steam Deck"
 	depends="
-		linux-firmware-amdgpu
 		linux-firmware-cirrus
 		linux-firmware-rtl_bt
 		linux-firmware-rtw88
+		oem-amd-nonfree-firmware
 	"

 	mkdir -p "$subpkgdir"
@@ -1,18 +1,21 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=oem-amd
 pkgdesc="AMD device support"
-pkgver=1.1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
+# linux-firmware-none prevents all of linux-firmware-* from being installed by
+# default
 depends="
 	alsa-ucm-conf
-	amd-ucode
+	linux-firmware-none
 "
 subpackages="
 	$pkgname-libva
+	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-vulkan
 	"
 source="
@@ -43,6 +46,17 @@ vulkan() {

 	mkdir "$subpkgdir"
 }
+
+nonfree_firmware() {
+	pkgdesc="Firmware for AMD devices"
+	depends="
+		amd-ucode
+		linux-firmware-amdgpu
+	"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
 f56b5293f88727bb4fcceb2a347527402dd0938e96403461b1e2a6821cc00a4e680f58770addd7ba1ded20a187f91ccfd6270bc8bd28c6eae75cc075952361ca  00-oem-amd.modules
@@ -1,19 +1,22 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=oem-intel
 pkgdesc="Intel device support"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="x86_64"
 options="!check !archcheck"
+# linux-firmware-none prevents all of linux-firmware-* from being installed by
+# default
 depends="
 	alsa-ucm-conf
-	intel-ucode
+	linux-firmware-none
 	sof-firmware
 "
 subpackages="
 	$pkgname-libva
+	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-vulkan
 	"

@@ -36,3 +39,14 @@ vulkan() {

 	mkdir "$subpkgdir"
 }
+
+nonfree_firmware() {
+	pkgdesc="Firmware for Intel devices"
+	depends="
+		intel-ucode
+		linux-firmware-i915
+		linux-firmware-intel
+	"
+
+	mkdir -p "$subpkgdir"
+}
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-base-ui-gnome
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
@@ -24,6 +24,7 @@ depends="
 	xdg-desktop-portal-gnome
 	xdg-desktop-portal-gtk
 	xdg-user-dirs
+	xwayland
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
@@ -31,13 +32,45 @@ source="
 	10_pmOS-wallpaper.gschema.override
 	"
 options="!check"
-subpackages="$pkgname-wallpaper-pmos:wallpaper_pmos"
+subpackages="
+	$pkgname-flatpak
+	$pkgname-wallpaper-pmos:wallpaper_pmos
+	"
+
+_pmb_recommends="
+	evince
+	firefox-esr
+	flatpak
+	font-noto
+	font-noto-emoji
+	gnome-calculator
+	gnome-clocks
+	gnome-console
+	gnome-contacts
+	gnome-maps
+	gnome-software
+	gnome-software-plugin-apk
+	gnome-text-editor
+	lollypop
+	loupe
+	postmarketos-artwork-wallpapers-gnome
+	xdg-user-dirs
+	xdg-user-dirs-gtk
+"

 package() {
 	install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
 		"$srcdir"/*.override
 }

+flatpak() {
+	install_if="$pkgname=$pkgver-r$pkgrel flatpak"
+	depends="gnome-software-plugin-flatpak"
+	install="$subpkgname.post-install"
+
+	mkdir "$subpkgdir"
+}
+
 # GNOME and Phosh depend on this package to set the pmOS wallpaper. GNOME
 # Mobile has a custom wallpaper because it directly draws icons and text on it
 # and it would be hard to read with the default wallpaper.
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# add a default repo (flathub.org)
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-gnome-mobile
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)"
 url="https://gnome.org/"
 arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile
@@ -26,29 +26,15 @@ depends="
 	networkmanager-elogind
 	pinentry-gnome
 	polkit-gnome
-	postmarketos-artwork-wallpapers-gnome
 	postmarketos-base-ui-gnome
 	tracker
 	tracker-miners
 	udisks2
-	xwayland
 	"
 _pmb_recommends="
 	calls
 	chatty
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-text-editor
-	gnome-calculator
-	gnome-clocks
-	gnome-contacts
-	gnome-software
-	gnome-software-plugin-apk
 	karlender
-	kgx
-	lollypop
-	loupe
 	mobile-config-firefox
 	portfolio
 	postmarketos-default-camera
@@ -56,7 +42,6 @@ _pmb_recommends="
 	postmarketos-welcome
 	postprocessd
 	ttyescape
-	xdg-user-dirs
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="
@@ -2,11 +2,12 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ui-gnome
 pkgver=3
-pkgrel=6
+pkgrel=7
 pkgdesc="(Wayland) Gnome Shell"
 url="https://gnome.org/"
 # armhf blocked by gnome-shell -> gjs -> mozjs102
-arch="noarch !armhf"
+# riscv64 blocked by gnome-calendar
+arch="noarch !armhf !riscv64"
 license="GPL-3.0-or-later"
 depends="
 	!gnome-shell-mobile
@@ -15,10 +16,12 @@ depends="
 	!mutter-mobile-schemas
 	gdm
 	gnome
-	kgx
 	postmarketos-base-ui-gnome
 	postmarketos-base-ui-gnome-wallpaper-pmos
-	xwayland
+	"
+_pmb_recommends="
+	gnome-calendar
+	nautilus
 	"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="firefox-wayland.sh"
@@ -2,7 +2,7 @@
 # Maintainer: Newbyte <newbyte@postmarketos.org>
 pkgname=postmarketos-ui-phosh
 pkgver=22.3
-pkgrel=3
+pkgrel=4
 pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
 url="https://phosh.mobi"
 arch="noarch !armhf"
@@ -29,24 +29,10 @@ depends="
 _pmb_recommends="
 	calls
 	chatty
-	evince
-	firefox-esr
-	font-noto
-	font-noto-emoji
-	gnome-calculator
-	gnome-clocks
-	gnome-console
-	gnome-contacts
-	gnome-software
-	gnome-software-plugin-apk
-	gnome-text-editor
 	karlender
-	lollypop
-	loupe
 	mobile-config-firefox
 	phosh-mobile-settings
 	portfolio
-	postmarketos-artwork-wallpapers
 	postmarketos-default-camera
 	postmarketos-tweaks
 	postmarketos-welcome
Author	SHA1	Message	Date
Clayton Craft	76c1a25774	SQUASH: bump pkgrels	2024-01-26 18:11:11 -08:00
Clayton Craft	4865886f27	pmos-ui-gnome: add some useful pkgs to pmb_recmds, drop riscv64 gnome-calendar is unavailable on riscv64, so support for that arch is dropped until someone is able to resolve that. IMHO this is an ok trade-off since I don't think many folks are running gnome desktop on riscv64 (yet?) and gnome-calendar is probably useful for more folks to have by default.	2024-01-26 18:11:11 -08:00
Clayton Craft	7bd880521d	pmos-base-ui-gnome: add gnome-maps to pmb_recmds	2024-01-26 18:11:11 -08:00
Clayton Craft	77f6ff0ad6	pmos-base-ui-gnome: install flatpak support by default	2024-01-26 18:11:11 -08:00
Clayton Craft	c2493a4feb	pmos-ui-{gnome,phosh}: Move shared pmb_rcmds to pmos-base-ui-gnome These apps are useful to have on the full GNOME desktop too, and this removes the need to duplicate package lists across UI meta packages that depend on the base gnome UI package.	2024-01-26 18:11:11 -08:00
Clayton Craft	80c4959e53	pmos-ui-{gnome,phosh}: move kgx/gnome-console to pmb_recmds The package name has changed so the new name, gnome-console, is used instead.	2024-01-26 18:11:11 -08:00
Clayton Craft	b5c87de7ae	pmos-ui-{gnome,phosh}: move shared depends to pmos-base-ui-gnome	2024-01-26 18:11:10 -08:00
Clayton Craft	4dec0ccb41	device-valve-jupiter: depend on oem-amd	2024-01-26 16:51:40 -08:00
Clayton Craft	563038ba84	device-generic-x86_64: add non-free fw subpackage	2024-01-26 16:51:40 -08:00
Clayton Craft	abee8103ac	oem-intel: add non-free fw subpackage	2024-01-26 16:51:40 -08:00
Clayton Craft	b0ca778156	oem-amd: add non-free fw subpackage	2024-01-26 16:13:22 -08:00