aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCullum Smith <cullum@sacredheartsc.com>2024-11-24 05:13:06 -0500
committerCullum Smith <cullum@sacredheartsc.com>2024-11-24 05:13:06 -0500
commit42613e4e0471859eabb45ef0f54bea8b2bed3923 (patch)
tree131975ba7c887c938459ac6a69b6a746efc01531
parent661b4cbf55a731ad500d7d584e5b748ef5039f0f (diff)
downloadinfrastructure-42613e4e0471859eabb45ef0f54bea8b2bed3923.tar.gz
poudriere updates
-rw-r--r--files/usr/local/etc/poudriere.d/make.conf.pkg_repository9
-rw-r--r--files/usr/local/etc/poudriere.d/pkglist.pkg_repository2
-rw-r--r--files/usr/local/libexec/poudriere-cron.pkg_repository2
3 files changed, 9 insertions, 4 deletions
diff --git a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
index a5ff5ef..d536c94 100644
--- a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
@@ -14,8 +14,6 @@ databases_luadbi_SET=PGSQL
databases_postgresql${postgresql_version}-client_SET=PAM LDAP
databases_postgresql${postgresql_version}-server_SET=PAM LDAP
devel_apr1_SET=LDAP
-devel_electron30_SET=PULSEAUDIO
-devel_electron30_UNSET=SNDIO
devel_gitolite_SET=GITUSER
devel_kio-extras_UNSET=AFC
devel_librelp_UNSET=GNUTLS
@@ -44,14 +42,21 @@ mail_postfix_SET=LDAP SASL SASLKRB5
mail_rspamd_SET=HYPERSCAN
misc_kdeutils_UNSET=KFLOPPY KTEATIME
mail_thunderbird_UNSET=PROFILE
+
+# With using virutal_oss, the OSS plugin causes a red error bar every
+# time the music is stopped paused. SNDIO seems fine.
multimedia_audacious-plugins_SET=LAME SNDIO
multimedia_audacious-plugins_UNSET=OSS
+
multimedia_ffmpeg_SET=OPENSSL
multimedia_ffmpeg_UNSET=GNUTLS
multimedia_kdemultimedia_UNSET=KDENLIVE
multimedia_pipewire_UNSET=JACK
+
+# Without PULSEAUDIO, sound doesn't work when playing videos in digikam.
multimedia_qt5-multimedia_SET=PULSEAUDIO ALSA
multimedia_qt6-multimedia_SET=PULSEAUDIO ALSA
+
multimedia_vlc_SET=FLAC MPEG2 X264 X265 VPX DCA FAAD AOM
multimedia_webcamd_UNSET=DVB INPUT RADIO
net-im_py-matrix-synapse_SET=PGSQL URLPREVIEW LDAP
diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
index 1b46287..24296ef 100644
--- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
@@ -19,12 +19,12 @@ databases/php${php_version}-pgsql
databases/postgresql${postgresql_version}-client
databases/postgresql${postgresql_version}-server
databases/redis
+deskutils/plasma5-sddm-kcm
deskutils/merkuro
deskutils/py-vdirsyncer
devel/android-tools
devel/ccache
devel/cgit
-devel/electron30
devel/git@lite
devel/gitolite
devel/php${php_version}-gettext
diff --git a/files/usr/local/libexec/poudriere-cron.pkg_repository b/files/usr/local/libexec/poudriere-cron.pkg_repository
index ce20ced..f352a10 100644
--- a/files/usr/local/libexec/poudriere-cron.pkg_repository
+++ b/files/usr/local/libexec/poudriere-cron.pkg_repository
@@ -17,7 +17,7 @@ done
for jail in "$@"; do
poudriere jail -u -j "$jail" > /dev/null
poudriere bulk -j "$jail" -f /usr/local/etc/poudriere.d/idm-pkglist -p "$ports_tree" -z idm > /dev/null
- poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/idm-pkglist -p "$ports_tree" -z idm -y > /dev/null
+ poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/idm-pkglist -p "$ports_tree" -z idm -y > /dev/null 2>&1
poudriere bulk -j "$jail" -f /usr/local/etc/poudriere.d/pkglist -p "$ports_tree" > /dev/null
poudriere pkgclean -j "$jail" -f /usr/local/etc/poudriere.d/pkglist -p "$ports_tree" -y > /dev/null 2>&1
done