From b9e353f2461a5898ed4984372022734ff2558668 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jul 15 2022 04:07:15 +0000 Subject: [PATCH 1/200] [parabola-keyring]: upgrade to v20220714 --- diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 511685e..60f6561 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -14,8 +14,8 @@ pkgname=parabola-keyring -pkgver=20220322 -_gitver=af4575f5afbdca6b556d182dab149e181edbd4b4 +pkgver=20220714 +_gitver=374d9b5b110ddfe715419b10caa4de2972aed162 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -42,6 +42,7 @@ prepare() { # but that build currently has a problem - the autobuilder handles # this now, via an un-published kludge in the autobuild.sh script # TODO: remove this note, after 'parabola-hackers' has been rebuilt + # NOTE: the rebuilt 'parabola-hackers' is now in [libre-testing] /usr/lib/parabola-hackers/pacman-make-keyring \ V="$pkgver" \ keyserver='hkp://pgp.cyberbits.eu:11371' \ From e0d7c1febf84dd2a7e647b0eba6b6112214724b5 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:05:37 +0000 Subject: [PATCH 2/200] addpkg: nonsystemd/acpid-openrc 20210506-1 Signed-off-by: David P --- diff --git a/nonsystemd/acpid-openrc/PKGBUILD b/nonsystemd/acpid-openrc/PKGBUILD new file mode 100644 index 0000000..68f2293 --- /dev/null +++ b/nonsystemd/acpid-openrc/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Rafli Akmal +# Contributor: artoo +# Contributor: Oscar Campos + + +pkgname=acpid-openrc +pkgver=20210506 +pkgrel=1 +pkgdesc="OpenRC acpid init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-galaxy') +provides=('init-acpid') +depends=('openrc' 'acpid') +conflicts=('init-acpid') +backup=('etc/conf.d/acpid') +source=("acpid.confd" + "acpid.initd") +sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' + 'c784a8b8ceceb3a453808a860a8dd9e0f8847f96cc82a7cc8410bc682aaadb06') + +package() { + install -Dm755 "$srcdir/acpid.initd" "$pkgdir/etc/init.d/acpid" + install -Dm644 "$srcdir/acpid.confd" "$pkgdir/etc/conf.d/acpid" +} diff --git a/nonsystemd/acpid-openrc/acpid.confd b/nonsystemd/acpid-openrc/acpid.confd new file mode 100644 index 0000000..9aadb4c --- /dev/null +++ b/nonsystemd/acpid-openrc/acpid.confd @@ -0,0 +1,6 @@ +# /etc/conf.d/acpid: config file for /etc/init.d/acpid + +# Options to pass to the acpid daemon. +# See the acpid(8) man page for more info. + +ACPID_ARGS="" diff --git a/nonsystemd/acpid-openrc/acpid.initd b/nonsystemd/acpid-openrc/acpid.initd new file mode 100644 index 0000000..98e36a2 --- /dev/null +++ b/nonsystemd/acpid-openrc/acpid.initd @@ -0,0 +1,22 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" +command="/usr/bin/acpid" +command_args="${ACPID_ARGS}" +description="Daemon for Advanced Configuration and Power Interface" +supervisor="supervise-daemon" +command_args_foreground="--foreground" +#pidfile="/run/acpid.pid" + +depend() { + need localmount + use logger +} + +reload() { + ebegin "Reloading acpid configuration" + ${supervisor} ${RC_SVCNAME} --signal HUP --pidfile /run/acpid.pid + eend $? +} From 8a9034ad31023dfb70cd6b48b7bcb52ac7e9ef40 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:06:09 +0000 Subject: [PATCH 3/200] addpkg: nonsystemd/alsa-utils-openrc 20210505-2 Signed-off-by: David P --- diff --git a/nonsystemd/alsa-utils-openrc/PKGBUILD b/nonsystemd/alsa-utils-openrc/PKGBUILD new file mode 100644 index 0000000..397a9bf --- /dev/null +++ b/nonsystemd/alsa-utils-openrc/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: artoo + +pkgname=alsa-utils-openrc +pkgver=20210505 +pkgrel=2 +pkgdesc="OpenRC alsa-utils init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-alsa-utils') +depends=('openrc' 'alsa-utils') +conflicts=('init-alsa-utils') +backup=('etc/conf.d/alsasound') +source=("alsasound.confd" + "alsasound.initd") +sha256sums=('d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' + '40c9f0e8d00b88ebd28bba9dcd91323549a77aeda12a5a86c532bddca7dae8d1') + +package() { + install -Dm755 "${srcdir}"/alsasound.initd "${pkgdir}"/etc/init.d/alsasound + install -Dm644 "${srcdir}"/alsasound.confd "${pkgdir}"/etc/conf.d/alsasound +} + diff --git a/nonsystemd/alsa-utils-openrc/alsasound.confd b/nonsystemd/alsa-utils-openrc/alsasound.confd new file mode 100644 index 0000000..6fec8f5 --- /dev/null +++ b/nonsystemd/alsa-utils-openrc/alsasound.confd @@ -0,0 +1,15 @@ +# RESTORE_ON_START: +# Do you want to restore your mixer settings? If not, your cards will be +# muted. +# no - Do not restore state +# yes - Restore state + +RESTORE_ON_START="yes" + +# SAVE_ON_STOP: +# Do you want to save changes made to your mixer volumes when alsasound +# stops? +# no - Do not save state +# yes - Save state + +SAVE_ON_STOP="yes" diff --git a/nonsystemd/alsa-utils-openrc/alsasound.initd b/nonsystemd/alsa-utils-openrc/alsasound.initd new file mode 100644 index 0000000..5d866f6 --- /dev/null +++ b/nonsystemd/alsa-utils-openrc/alsasound.initd @@ -0,0 +1,87 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +alsastatedir=/var/lib/alsa +alsascrdir=/etc/alsa.d +alsahomedir=/run/alsasound + +extra_commands="save restore" + +depend() { + need localmount + after bootmisc modules isapnp coldplug hotplug +} + +restore() { + ebegin "Restoring Mixer Levels" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + if [ ! -r "${alsastatedir}/asound.state" ] ; then + ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!" + eend 0 + return 0 + fi + + local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)" + local CARDNUM + for cardnum in ${cards}; do + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + [ -e /dev/snd/controlC${cardnum} ] || sleep 2 + alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \ + || ewarn "Errors while restoring defaults, ignoring" + done + + for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do + [ -e "${ossfile}" ] || continue + # We use cat because I'm not sure if cp works properly on /proc + local procfile=${ossfile##${alsastatedir}/oss} + procfile="$(echo "${procfile}" | sed -e 's,_,/,g')" + if [ -e /proc/asound/"${procfile}"/oss ] ; then + cat "${ossfile}" > /proc/asound/"${procfile}"/oss + fi + done + + eend 0 +} + +save() { + ebegin "Storing ALSA Mixer Levels" + + checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1 + + mkdir -p "${alsastatedir}" + if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then + eerror "Error saving levels." + eend 1 + return 1 + fi + + for ossfile in /proc/asound/card*/pcm*/oss; do + [ -e "${ossfile}" ] || continue + local device=${ossfile##/proc/asound/} ; device=${device%%/oss} + device="$(echo "${device}" | sed -e 's,/,_,g')" + mkdir -p "${alsastatedir}/oss/" + cp "${ossfile}" "${alsastatedir}/oss/${device}" + done + + eend 0 +} + +start() { + if [ "${RESTORE_ON_START}" = "yes" ]; then + restore + fi + + return 0 +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ]; then + save + fi + return 0 +} From 8491d8952f75b3cf7b053d4a1ca2cb8fb0c815a5 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:06:47 +0000 Subject: [PATCH 4/200] addpkg: nonsystemd/avahi-openrc 20210505-2 Signed-off-by: David P --- diff --git a/nonsystemd/avahi-openrc/PKGBUILD b/nonsystemd/avahi-openrc/PKGBUILD new file mode 100644 index 0000000..593faab --- /dev/null +++ b/nonsystemd/avahi-openrc/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: artoo + +pkgname=avahi-openrc +pkgver=20210505 +pkgrel=2 +pkgdesc="OpenRC avahi init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-avahi') +depends=('avahi' 'openrc') +conflicts=('init-avahi') +source=('avahi-daemon.initd' + 'avahi-dnsconfd.initd' + 'autoipd-openrc.sh') +sha256sums=('0e6513b19d79edfe8d3a124e15fe48ee3cfa073fa93971c2265d82c4df7caa10' + 'a359e718f6c0be654ded4f27e2215067564358d43e17d9a99d5d65c8379eb815' + '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf') + +package() { + install -Dm755 "${srcdir}"/avahi-daemon.initd "${pkgdir}"/etc/init.d/avahi-daemon + install -Dm755 "${srcdir}"/avahi-dnsconfd.initd "${pkgdir}"/etc/init.d/avahi-dnsconfd + + install -Dm755 autoipd-openrc.sh "${pkgdir}"/usr/lib/netifrc/net/autoipd.sh +} diff --git a/nonsystemd/avahi-openrc/autoipd-openrc.sh b/nonsystemd/avahi-openrc/autoipd-openrc.sh new file mode 100644 index 0000000..7490852 --- /dev/null +++ b/nonsystemd/avahi-openrc/autoipd-openrc.sh @@ -0,0 +1,32 @@ +# Copyright (C) 2004-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Contributed by Sven Wegener (swegener@gentoo.org) + +_config_vars="$_config_vars autoipd" + +autoipd_depend() { + program /usr/bin/avahi-autoipd + after interface +} + +autoipd_start() { + _exists true || return 1 + + eval args=\$autoipd_${IFVAR} + + ebegin "Starting avahi-autoipd" + /usr/bin/avahi-autoipd --daemonize --syslog --wait ${args} "${IFACE}" + eend "${?}" || return 1 + + _show_address + + return 0 +} + +autoipd_stop() { + /usr/bin/avahi-autoipd --check --syslog "${IFACE}" || return 0 + + ebegin "Stopping avahi-autoipd" + /usr/bin/avahi-autoipd --kill --syslog "${IFACE}" + eend "${?}" +} diff --git a/nonsystemd/avahi-openrc/avahi-daemon.initd b/nonsystemd/avahi-openrc/avahi-daemon.initd new file mode 100644 index 0000000..c5cd650 --- /dev/null +++ b/nonsystemd/avahi-openrc/avahi-daemon.initd @@ -0,0 +1,31 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" +command="/usr/sbin/avahi-daemon" +supervisor="supervise-daemon" + +depend() { + before netmount nfsmount + use net + need dbus +} + +# start() { +# ebegin "Starting avahi-daemon" +# /usr/bin/avahi-daemon -D +# eend $? +# } +# +# stop() { +# ebegin "Stopping avahi-daemon" +# /usr/bin/avahi-daemon -k +# eend $? +# } + +reload() { + ebegin "Reloading avahi-daemon" + ${command} -r + eend $? +} diff --git a/nonsystemd/avahi-openrc/avahi-dnsconfd.initd b/nonsystemd/avahi-openrc/avahi-dnsconfd.initd new file mode 100644 index 0000000..6f86c6d --- /dev/null +++ b/nonsystemd/avahi-openrc/avahi-dnsconfd.initd @@ -0,0 +1,30 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" +supervisor="supervise-daemon" +command="/usr/bin/avahi-dnsconfd" + +depend() { + need avahi-daemon + use net +} + +# start() { +# ebegin "Starting avahi-dnsconfd" +# /usr/bin/avahi-dnsconfd -D +# eend $? +# } +# +# stop() { +# ebegin "Stopping avahi-dnsconfd" +# /usr/bin/avahi-dnsconfd -k +# eend $? +# } + +reload() { + ebegin "Reloading avahi-dnsconfd" + ${command} -r + eend $? +} From 0ea50801e2b09f1d9690bd08dcd4980fdcc1a7f2 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:08:10 +0000 Subject: [PATCH 5/200] addpkg: nonsystemd/bluez-openrc 20210506-1 Signed-off-by: David P --- diff --git a/nonsystemd/bluez-openrc/PKGBUILD b/nonsystemd/bluez-openrc/PKGBUILD new file mode 100644 index 0000000..aacf01d --- /dev/null +++ b/nonsystemd/bluez-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=bluez-openrc +pkgver=20210506 +pkgrel=1 +pkgdesc="OpenRC bluez init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-bluez') +depends=('bluez' 'openrc') +conflicts=('init-bluez') +source=("bluetoothd.initd") +sha256sums=('b99147767d339b0d6707bbd8cd4da51e795835b7519e7d6d2fcf70dabcaeeb9a') + +package() { + install -Dm755 "${srcdir}"/bluetoothd.initd "${pkgdir}"/etc/init.d/bluetoothd +} diff --git a/nonsystemd/bluez-openrc/bluetoothd.initd b/nonsystemd/bluez-openrc/bluetoothd.initd new file mode 100644 index 0000000..4d38cd2 --- /dev/null +++ b/nonsystemd/bluez-openrc/bluetoothd.initd @@ -0,0 +1,13 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +supervisor="supervise-daemon" +#pidfile="/run/bluetoothd.pid" +command="/usr/lib/bluetooth/bluetoothd" +#command_background=1 + +depend() { + after coldplug + need dbus localmount hostname +} From 556a026f6677f85ba3a50a57d12220bfb342a85c Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:10:06 +0000 Subject: [PATCH 6/200] addpkg: nonsystemd/chrony-openrc 20210506-2 Signed-off-by: David P --- diff --git a/nonsystemd/chrony-openrc/PKGBUILD b/nonsystemd/chrony-openrc/PKGBUILD new file mode 100644 index 0000000..546e25c --- /dev/null +++ b/nonsystemd/chrony-openrc/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Nathan Owens + +pkgname=chrony-openrc +pkgver=20210506 +pkgrel=2 +pkgdesc="OpenRC chrony init" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-galaxy') +provides=('init-chrony' 'init-timed') +depends=('openrc' 'chrony') +conflicts=('init-chrony' 'init-timed') +backup=('etc/conf.d/chrony') +source=("chrony.confd" + "chrony.initd") +sha256sums=('e65e4cf13bf00d6e7378f86f4513b5b3312b1d8b181bedbef6d8f55e8037f1de' + '149b12adabd0ab5358de1b3d8674dd5ecde7acd7d14310ee83dae4a72bc84f0b') +b2sums=('496483539b15a55c15287178b7df730fe33fe8d7ceda164f362c0dd6cd833bbee84a0a0496586489659075fc10aafed0f221fb78d60804ddd9edd24e71f6d49b' + '4e8f80b060bcc7f6f3b0d702f1b85387f6e545c31f315232574bf8ebd5ad2a6604a80a994ba629ffe419776a29339d894f0c1c7db78e9cd6fb4dc4761cf2c398') + + +package() { + install -Dm755 "${srcdir}"/chrony.initd "${pkgdir}"/etc/init.d/chrony + install -Dm644 "${srcdir}"/chrony.confd "${pkgdir}"/etc/conf.d/chrony +} diff --git a/nonsystemd/chrony-openrc/chrony.confd b/nonsystemd/chrony-openrc/chrony.confd new file mode 100644 index 0000000..3c0f5ab --- /dev/null +++ b/nonsystemd/chrony-openrc/chrony.confd @@ -0,0 +1,17 @@ +# /etc/conf.d/chronyd + +CFGFILE="/etc/chrony.conf" + +# chronyd takes some time to perform a second fork, by enabling this +# option chronyd is deamonized through start-stop-daemon(1) thereby +# significantly reducing the startup time. +FAST_STARTUP=yes + +# Configuration dependant options : +# -s - Set system time from RTC if rtcfile directive present +# -r - Reload sample histories if dumponexit directive present +# +# The combination of "-s -r" allows chronyd to perform long term averaging of +# the gain or loss rate across system reboots and shutdowns. + +ARGS="" diff --git a/nonsystemd/chrony-openrc/chrony.initd b/nonsystemd/chrony-openrc/chrony.initd new file mode 100644 index 0000000..ce7b079 --- /dev/null +++ b/nonsystemd/chrony-openrc/chrony.initd @@ -0,0 +1,78 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.8 2007/03/22 14:32:09 tove Exp $ + +command="/usr/bin/chronyd" +description="NTP daemon" +pidfile="/run/chrony/chronyd.pid" + +depend() { + need net + after firewall + provide ntp-client ntp-server + use dns +} + +checkconfig() { + # Note that /etc/chrony/chrony.keys is *NOT* checked. This + # is because the user may have specified another key + # file, and we don't want to force the user to use that + # exact name for the key file. + if [ ! -f "${CFGFILE}" ] ; then + eerror "Please create ${CFGFILE} and the" + eerror "chrony key file (usually /etc/chrony/chrony.keys)" + eerror "by using the" + eerror "" + eerror " chrony.conf.example" + eerror " chrony.keys.example" + eerror "" + eerror "files (from the documentation directory)" + eerror "as templates." + return 1 + else + # Actually, I tried it, and chrony seems to ignore the pidfile + # option. I'm going to leave it here anyway, since you never + # know if it might be handy + _cfg_pidfile=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"` + if [ -n "$_cfg_pidfile" ] ; then + pidfile="$_cfg_pidfile" + fi + fi + return 0 +} + +setxtrarg() { + if [ -c /dev/rtc ]; then + grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s" + fi + grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r" + return 0 +} + +start() { + checkconfig || return $? + setxtrarg + + local daemon_args= + if yesno "$FAST_STARTUP"; then + ARGS="${ARGS} -n" + daemon_args="--background" + fi + + ebegin "Starting chronyd" + start-stop-daemon $daemon_args --start --quiet \ + --exec "${command}" \ + --pidfile "${pidfile}" \ + -- -f "${CFGFILE}" ${ARGS} + eend $? "Failed to start chronyd" +} + +stop() { + checkconfig || return $? + + ebegin "Stopping chronyd" + start-stop-daemon --stop --quiet \ + --pidfile "${pidfile}" + eend $? "Failed to stop chronyd" +} From a540c3434c185b7e4ffe8395884892c3e75173bb Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:10:38 +0000 Subject: [PATCH 7/200] addpkg: nonsystemd/docker-openrc 20210505-1 Signed-off-by: David P --- diff --git a/nonsystemd/docker-openrc/PKGBUILD b/nonsystemd/docker-openrc/PKGBUILD new file mode 100644 index 0000000..4996452 --- /dev/null +++ b/nonsystemd/docker-openrc/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Rafli Akmal +# Contributor: artoo +# Contributor: Oscar Campos + +pkgname=docker-openrc +pkgver=20210505 +pkgrel=1 +pkgdesc="OpenRC docker init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-galaxy') +depends=('openrc' 'docker') +provides=('init-docker') +conflicts=('init-docker') +backup=('etc/conf.d/docker') +source=("docker.confd" + "docker.initd") +sha256sums=('3f661c0032dda93d448f138308b1d70b35ef9297bc43816891bbcd1ab5d7cc5e' + 'd891f5ba66b5a8dd472b7b19db774af7a22a7a1c0766cb57c3422c098a82c493') + +package() { + install -Dm755 "$srcdir/docker.initd" "$pkgdir/etc/init.d/docker" + install -Dm644 "$srcdir/docker.confd" "$pkgdir/etc/conf.d/docker" +} diff --git a/nonsystemd/docker-openrc/docker.confd b/nonsystemd/docker-openrc/docker.confd new file mode 100644 index 0000000..cc599e6 --- /dev/null +++ b/nonsystemd/docker-openrc/docker.confd @@ -0,0 +1,29 @@ +# /etc/conf.d/docker: config file for /etc/init.d/docker + +# where the docker daemon output gets piped +# this contains both stdout and stderr. If you need to separate them, +# see the settings below +#DOCKER_LOGFILE="/var/log/docker.log" + +# where the docker daemon stdout gets piped +# if this is not set, DOCKER_LOGFILE is used +#DOCKER_OUTFILE="/var/log/docker-out.log" + +# where the docker daemon stderr gets piped +# if this is not set, DOCKER_LOGFILE is used +#DOCKER_ERRFILE="/var/log/docker-err.log" + +# where docker's pid get stored +#DOCKER_PIDFILE="/run/docker.pid" + +# Settings for process limits (ulimit) +#DOCKER_ULIMIT="-c unlimited -n 1048576 -u unlimited" + +# seconds to wait for sending SIGTERM and SIGKILL signals when stopping docker +#DOCKER_RETRY="TERM/60/KILL/10" + +# where the docker daemon itself is run from +#DOCKERD_BINARY="/usr/bin/dockerd" + +# any other random options you want to pass to docker +DOCKER_OPTS="" diff --git a/nonsystemd/docker-openrc/docker.initd b/nonsystemd/docker-openrc/docker.initd new file mode 100644 index 0000000..738747d --- /dev/null +++ b/nonsystemd/docker-openrc/docker.initd @@ -0,0 +1,28 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="${DOCKERD_BINARY:-/usr/bin/dockerd}" +pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" +command_args="-p \"${pidfile}\" ${DOCKER_OPTS}" +DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" +DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}" +DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}" +start_stop_daemon_args="--background \ + --stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\"" + +extra_started_commands="reload" + +rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u unlimited}" + +retry="${DOCKER_RETRY:-TERM/60/KILL/10}" + +start_pre() { + checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" +} + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? "Failed to stop ${RC_SVCNAME}" +} From f00e839d4a4763932deb9436836e43ffd05718ea Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:11:54 +0000 Subject: [PATCH 8/200] addpkg: nonsystemd/gdm-openrc 20220104-1 Signed-off-by: David P --- diff --git a/nonsystemd/gdm-openrc/PKGBUILD b/nonsystemd/gdm-openrc/PKGBUILD new file mode 100644 index 0000000..1d0c925 --- /dev/null +++ b/nonsystemd/gdm-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=gdm-openrc +pkgver=20220104 +pkgrel=1 +pkgdesc="OpenRC gdm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-displaymanager') +depends=('gdm' 'openrc') +conflicts=('init-displaymanager') +source=("gdm.initd") +sha256sums=('b46bb53bf9eb0c8d292133216af3c451060e8acc278e837d2bb5a58d548baec0') + +package() { + install -Dm755 "$srcdir/gdm.initd" "$pkgdir/etc/init.d/gdm" +} diff --git a/nonsystemd/gdm-openrc/gdm.initd b/nonsystemd/gdm-openrc/gdm.initd new file mode 100644 index 0000000..ecdad21 --- /dev/null +++ b/nonsystemd/gdm-openrc/gdm.initd @@ -0,0 +1,17 @@ +#!/usr/bin/openrc-run + +supervisor=supervise-daemon +command="/usr/bin/gdm" + +depend() { + need localmount + + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + want logind + use xfs + + provide xdm display-manager +} From 26f2616f24ceecbb1f71f1553af3c0956aa81805 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:13:14 +0000 Subject: [PATCH 9/200] addpkg: nonsystemd/gpm-openrc 20210505-2 Signed-off-by: David P --- diff --git a/nonsystemd/gpm-openrc/PKGBUILD b/nonsystemd/gpm-openrc/PKGBUILD new file mode 100644 index 0000000..55f8487 --- /dev/null +++ b/nonsystemd/gpm-openrc/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: artoo + +pkgname=gpm-openrc +pkgver=20210505 +pkgrel=2 +pkgdesc="OpenRC gpm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-system') +provides=('init-gpm') +depends=('openrc' 'gpm') +conflicts=('init-gpm') +backup=('etc/conf.d/gpm') +source=("gpm.confd" + "gpm.initd") +sha256sums=('73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' + 'b0a698c19a699b66375b39ad10e59a1e565c67b4c2dbf281f571d185654cf711') + +package() { + install -Dm755 "${srcdir}"/gpm.initd "${pkgdir}"/etc/init.d/gpm + install -Dm755 "${srcdir}"/gpm.confd "${pkgdir}"/etc/conf.d/gpm +} diff --git a/nonsystemd/gpm-openrc/gpm.confd b/nonsystemd/gpm-openrc/gpm.confd new file mode 100644 index 0000000..f21c257 --- /dev/null +++ b/nonsystemd/gpm-openrc/gpm.confd @@ -0,0 +1,23 @@ +# /etc/init.d/gpm + +# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry + +MOUSE=ps2 +#MOUSE=imps2 +#MOUSEDEV=/dev/psaux +MOUSEDEV=/dev/input/mice + +# Extra settings + +#RESPONSIVENESS= +#REPEAT_TYPE=raw + +# Please uncomment this line if you want gpm to understand charsets used +# in URLs and names with ~ or : in them, etc. This is a good idea to turn on! + +#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\"" + +# Various other options, see gpm(8) manpage for more. + +#APPEND="-g 1 -A60" +#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60" diff --git a/nonsystemd/gpm-openrc/gpm.initd b/nonsystemd/gpm-openrc/gpm.initd new file mode 100644 index 0000000..4d06adb --- /dev/null +++ b/nonsystemd/gpm-openrc/gpm.initd @@ -0,0 +1,28 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +#NB: Config is in /etc/conf.d/gpm + +command=/usr/bin/gpm +command_args=" + -m ${MOUSEDEV} + -t ${MOUSE} + ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} + ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} + ${APPEND} +" + +pidfile=/var/run/gpm.pid + +depend() { + need localmount + use hotplug logger +} + +start_pre() { + if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then + eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" + return 1 + fi +} From 57388a1cfee692efcffd165514fa0272116c6ee5 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:13:32 +0000 Subject: [PATCH 10/200] addpkg: nonsystemd/lightdm-openrc 20220104-1 Signed-off-by: David P --- diff --git a/nonsystemd/lightdm-openrc/PKGBUILD b/nonsystemd/lightdm-openrc/PKGBUILD new file mode 100644 index 0000000..9ed003a --- /dev/null +++ b/nonsystemd/lightdm-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=lightdm-openrc +pkgver=20220104 +pkgrel=1 +pkgdesc="OpenRC lightdm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-displaymanager') +depends=('lightdm' 'openrc') +conflicts=('init-displaymanager') +source=("lightdm.initd") +sha256sums=('a33a505b49088a5d5c8388da03c826e40699694fcbfd22775b15a957a07880dc') + +package() { + install -Dm755 "$srcdir/lightdm.initd" "$pkgdir/etc/init.d/lightdm" +} diff --git a/nonsystemd/lightdm-openrc/lightdm.initd b/nonsystemd/lightdm-openrc/lightdm.initd new file mode 100644 index 0000000..2eace04 --- /dev/null +++ b/nonsystemd/lightdm-openrc/lightdm.initd @@ -0,0 +1,16 @@ +#!/usr/bin/openrc-run + +supervisor=supervise-daemon +command="/usr/bin/lightdm" + +depend() { + need localmount + + after bootmisc consolefont modules netmount + after ypbind autofs openvpn gpm lircmd + after quota keymaps acpid + before alsasound + want logind + use xfs + provide xdm display-manager +} From 69972ec4a14bf4d062c6b63cfc1044ad3439d9f7 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:14:50 +0000 Subject: [PATCH 11/200] addpkg: nonsystemd/lxdm-openrc 20220104-1 Signed-off-by: David P --- diff --git a/nonsystemd/lxdm-openrc/PKGBUILD b/nonsystemd/lxdm-openrc/PKGBUILD new file mode 100644 index 0000000..46c5ae8 --- /dev/null +++ b/nonsystemd/lxdm-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=lxdm-openrc +pkgver=20220104 +pkgrel=1 +pkgdesc="OpenRC lxdm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-galaxy') +provides=('init-displaymanager') +depends=('lxdm-gtk3' 'openrc') +conflicts=('init-displaymanager') +source=("lxdm.initd") +sha256sums=('57ec70f482e606961971978565fc268fba9388b277ce751c2d0a16f44d081e42') + +package() { + install -Dm755 "$srcdir/lxdm.initd" "$pkgdir/etc/init.d/lxdm" +} diff --git a/nonsystemd/lxdm-openrc/lxdm.initd b/nonsystemd/lxdm-openrc/lxdm.initd new file mode 100644 index 0000000..2e66aae --- /dev/null +++ b/nonsystemd/lxdm-openrc/lxdm.initd @@ -0,0 +1,18 @@ +#!/usr/bin/openrc-run + +command="/usr/bin/lxdm-binary" +command_args="-d" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need localmount dbus logind + + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + use xfs + + provide xdm display-manager +} From ba9879cc6c2764e323695d6bda3db4d7a8d1bed7 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:15:42 +0000 Subject: [PATCH 12/200] addpkg: nonsystemd/sddm-openrc 20220104-1 Signed-off-by: David P --- diff --git a/nonsystemd/sddm-openrc/PKGBUILD b/nonsystemd/sddm-openrc/PKGBUILD new file mode 100644 index 0000000..4c61228 --- /dev/null +++ b/nonsystemd/sddm-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=sddm-openrc +pkgver=20220104 +pkgrel=1 +pkgdesc="OpenRC sddm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-displaymanager') +depends=('sddm' 'openrc') +conflicts=('init-displaymanager') +source=("sddm.initd") +sha256sums=('0d24660f022b3e5e1f8196a4022981045d9dd79eb74531d19d6981a5ba735f1e') + +package() { + install -Dm755 "$srcdir/sddm.initd" "$pkgdir/etc/init.d/sddm" +} diff --git a/nonsystemd/sddm-openrc/sddm.initd b/nonsystemd/sddm-openrc/sddm.initd new file mode 100644 index 0000000..12bcbf9 --- /dev/null +++ b/nonsystemd/sddm-openrc/sddm.initd @@ -0,0 +1,17 @@ +#!/usr/bin/openrc-run + +supervisor=supervise-daemon +command="/usr/bin/sddm" + +depend() { + need localmount + + after bootmisc consolefont modules netmount + after ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + want logind + use xfs + + provide xdm display-manager +} From 959f029eea0b95b133cd9dfd0a7f40f78253da1e Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:16:01 +0000 Subject: [PATCH 13/200] addpkg: nonsystemd/tlp-openrc 20210505-1 Signed-off-by: David P --- diff --git a/nonsystemd/tlp-openrc/PKGBUILD b/nonsystemd/tlp-openrc/PKGBUILD new file mode 100644 index 0000000..63887b0 --- /dev/null +++ b/nonsystemd/tlp-openrc/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Rafli Akmal +# Contributor: artoo +# Contributor: Oscar Campos + +pkgname=tlp-openrc +pkgver=20210505 +pkgrel=1 +pkgdesc="OpenRC tlp init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-galaxy') +depends=('openrc' 'tlp') +provides=('init-tlp') +conflicts=('init-tlp') +source=('tlp.initd') +sha256sums=('4fc771f1ce9423b1f5facc006845d3ab5cbce3bfdf1aa0737b2ed8e7d6f8c3ac') + +package() { + install -Dm755 "$srcdir/tlp.initd" "$pkgdir/etc/init.d/tlp" +} diff --git a/nonsystemd/tlp-openrc/tlp.initd b/nonsystemd/tlp-openrc/tlp.initd new file mode 100644 index 0000000..827cafd --- /dev/null +++ b/nonsystemd/tlp-openrc/tlp.initd @@ -0,0 +1,25 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +description="TLP start/stop actions" + +depend() { + after modules + + # sysfs is required (bat thresholds); localmount:/usr + need sysfs localmount + + # thinkpad-radiosw (USE=deprecated) + use acpid + + after NetworkManager dbus bluetooth + + # run after xdm to avoid bluetooth/wwan/... race-condition with gdm + after xdm +} + +start() { /usr/bin/tlp init start; } +stop() { /usr/bin/tlp init stop; } +restart() { /usr/bin/tlp init restart; } From 9fea9c0f08f1efd2c74ba5f667e36ff0835527b9 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:17:52 +0000 Subject: [PATCH 14/200] addpkg: nonsystemd/wpa_supplicant-openrc 20210505-1 Signed-off-by: David P --- diff --git a/nonsystemd/wpa_supplicant-openrc/PKGBUILD b/nonsystemd/wpa_supplicant-openrc/PKGBUILD new file mode 100644 index 0000000..042de61 --- /dev/null +++ b/nonsystemd/wpa_supplicant-openrc/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: artoo + +pkgname=wpa_supplicant-openrc +pkgver=20210505 +pkgrel=1 +pkgdesc="OpenRC wpa_supplicant init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-system') +provides=('init-wpa_supplicant') +depends=('openrc' 'wpa_supplicant') +conflicts=('init-wpa_supplicant') +backup=('etc/conf.d/wpa_supplicant') +source=("wpa_supplicant.confd" + "wpa_supplicant.initd" + "wpa_cli.sh") +sha256sums=('27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa' + '7789b54cabb7317d9368531f4832ae7b256e26ce0e5ac7ab8d0a251ade18342a' + '300d0b54280c2582e74f78087edad3b0da19b9e4e0440f7f320f523a46da8373') + +package() { + install -Dm755 "${srcdir}"/wpa_supplicant.initd "${pkgdir}"/etc/init.d/wpa_supplicant + install -Dm644 "${srcdir}"/wpa_supplicant.confd "${pkgdir}"/etc/conf.d/wpa_supplicant + + install -Dm755 "${srcdir}"/wpa_cli.sh "${pkgdir}"/etc/wpa_supplicant/wpa_cli.sh +} + + diff --git a/nonsystemd/wpa_supplicant-openrc/wpa_cli.sh b/nonsystemd/wpa_supplicant-openrc/wpa_cli.sh new file mode 100644 index 0000000..a60a13c --- /dev/null +++ b/nonsystemd/wpa_supplicant-openrc/wpa_cli.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Copyright 1999-2011 Gentoo Foundation +# Written by Roy Marples +# Distributed under the terms of the GNU General Public License v2 +# Alternatively, this file may be distributed under the terms of the BSD License + +if [ -z "$1" -o -z "$2" ]; then + logger -t wpa_cli "Insufficient parameters" + exit 1 +fi + +INTERFACE="$1" +ACTION="$2" + +# Note, the below action must NOT mark the interface down via ifconfig, ip or +# similar. Addresses can be removed, changed and daemons can be stopped, but +# the interface must remain up for wpa_supplicant to work. + +if [ -f /etc/parabola-release ]; then + EXEC="/etc/init.d/net.${INTERFACE} --quiet" +else + logger -t wpa_cli "I don't know what to do with this distro!" + exit 1 +fi + +case ${ACTION} in + CONNECTED) + EXEC="${EXEC} start" + ;; + DISCONNECTED) + # Deactivated, since stopping /etc/init.d/net.wlanX + # stops the network completly. + EXEC="false ${EXEC} stop" + ;; + *) + logger -t wpa_cli "Unknown action ${ACTION}" + exit 1 + ;; +esac + +# ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't +# stopping the interface and a background process - like wpa_cli - is. +export IN_BACKGROUND=true + +logger -t wpa_cli "interface ${INTERFACE} ${ACTION}" +${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed" diff --git a/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.confd b/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.confd new file mode 100644 index 0000000..5381c8c --- /dev/null +++ b/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.confd @@ -0,0 +1,10 @@ +# conf.d file for wpa_supplicant + +# uncomment this if wpa_supplicant starts up before your network interface +# is ready and it causes issues +# rc_want="dev-settle" + +# Please check man 8 wpa_supplicant for more information about the options +# wpa_supplicant accepts. +# +wpa_supplicant_args="" diff --git a/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.initd b/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.initd new file mode 100644 index 0000000..1e107c6 --- /dev/null +++ b/nonsystemd/wpa_supplicant-openrc/wpa_supplicant.initd @@ -0,0 +1,70 @@ +#!/usr/bin/openrc-run +# Copyright (c) 2009 Roy Marples +# All rights reserved. Released under the 2-clause BSD license. + +command=/usr/bin/wpa_supplicant +: ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf} +wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if +command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if" +name="WPA Supplicant Daemon" + +depend() +{ + need localmount + use logger + after bootmisc modules + before dns dhcpcd net + keyword -shutdown +} + +find_wireless() +{ + local iface= + + case "$RC_UNAME" in + Linux) + for iface in /sys/class/net/*; do + if [ -e "$iface"/wireless -o \ + -e "$iface"/phy80211 ] + then + echo "${iface##*/}" + return 0 + fi + done + ;; + *) + for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do + if ifconfig "${iface##*/}" 2>/dev/null | \ + grep -q "[ ]*ssid " + then + echo "${iface##*/}" + return 0 + fi + done + ;; + esac + + return 1 +} + +append_wireless() +{ + local iface= i= + + iface=$(find_wireless) + if [ -n "$iface" ]; then + for i in $iface; do + command_args="$command_args -i$i" + done + else + eerror "Could not find a wireless interface" + fi +} + +start_pre() +{ + case " $command_args" in + *" -i"*) ;; + *) append_wireless;; + esac +} From 84b26f14db7c57e7073bd86ed461889c7b879e67 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 17 2022 23:18:24 +0000 Subject: [PATCH 15/200] addpkg: nonsystemd/xdm-openrc 20220104-1 Signed-off-by: David P --- diff --git a/nonsystemd/xdm-openrc/PKGBUILD b/nonsystemd/xdm-openrc/PKGBUILD new file mode 100644 index 0000000..41d0054 --- /dev/null +++ b/nonsystemd/xdm-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=xdm-openrc +pkgver=20220104 +pkgrel=1 +pkgdesc="OpenRC xdm init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-xdm') +depends=('xorg-xdm' 'openrc') +conflicts=('init-xdm') +source=("xdm.initd") +sha256sums=('d0ec3cf9ca3a010e3ef6e36b66c98bbb1102d9f203a595b642c554952f71d467') + +package() { + install -Dm755 "$srcdir/xdm.initd" "$pkgdir/etc/init.d/xdm" +} diff --git a/nonsystemd/xdm-openrc/xdm.initd b/nonsystemd/xdm-openrc/xdm.initd new file mode 100644 index 0000000..7475756 --- /dev/null +++ b/nonsystemd/xdm-openrc/xdm.initd @@ -0,0 +1,16 @@ +#!/usr/bin/openrc-run + +supervisor=supervise-daemon +command="/usr/bin/xdm" + +depend() { + need localmount + + after bootmisc consolefont modules netmount + after readahead-list ypbind autofs openvpn gpm lircmd + after quota keymaps + before alsasound + + use logind dbus xfs + provide display-manager +} From 67e7c7c3060fbdf504d825a27caa3f8cf8538704 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 18 2022 02:11:25 +0000 Subject: [PATCH 16/200] updpkg: libre/parabolaiso 65-1, delete openrc-desktop Signed-off-by: David P --- diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD index 68b37f5..660969b 100644 --- a/libre/parabolaiso/PKGBUILD +++ b/libre/parabolaiso/PKGBUILD @@ -4,14 +4,14 @@ # Maintainer: David P. pkgname=parabolaiso -pkgver=64 +pkgver=65 pkgrel=1 pkgdesc="Tools for creating Parabola GNU/Linux-libre live and install iso images" arch=(any) license=(GPL3) url="https://git.parabola.nu/parabolaiso.git/" -depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils -libarchive libisoburn mtools squashfs-tools grub) +depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils grub +libarchive libisoburn mtools squashfs-tools) makedepends=(git) checkdepends=(shellcheck) optdepends=( @@ -20,7 +20,7 @@ optdepends=( 'qemu-desktop: for run_parabolaiso' 'qemu-user-static: for armv7h support when building in bootstrap mode from x86' ) -source=("git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed") +source=(git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed) sha256sums=('SKIP') validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P. diff --git a/nonsystemd/openrc-desktop/PKGBUILD b/nonsystemd/openrc-desktop/PKGBUILD deleted file mode 100644 index 23ea677..0000000 --- a/nonsystemd/openrc-desktop/PKGBUILD +++ /dev/null @@ -1,174 +0,0 @@ -# Maintainer (Artix): artoo -# Maintainer: Omar Vega Ramos -# Maintainer: David P - -pkgver=20201202 # date +%Y%m%d -_commit=5cf13c1eee7fdb74078d79a2c85d1fe2fdde192c -_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}" - -pkgbase=openrc-desktop -pkgname=('acpid-openrc' - 'alsa-utils-openrc' - 'avahi-openrc' - 'bluez-openrc' - 'displaymanager-openrc' - 'gpm-openrc' - 'wpa_supplicant-openrc' - 'chrony-openrc' - 'tlp-openrc') -pkgrel=1 -arch=('any') -url='https://github.com/gentoo/gentoo' -license=('GPL2') -groups=('openrc-desktop') -source=('acpid.confd' - 'acpid.initd' - "alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4" - "alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r8" - 'avahi-daemon.initd' - 'avahi-dnsconfd.initd' - 'autoipd-openrc.sh' - 'bluetoothd.initd' - 'xdm.confd' - 'xdm.initd' - 'xdm-setup.initd' - 'startDM.sh' - "gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d" - "gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2" - "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d" - "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d" - "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh" - "chronyd.confd::${_url}/net-misc/chrony/files/chronyd.conf-r1" - "chronyd.initd::${_url}/net-misc/chrony/files/chronyd.init-r2" - "tlp.initd::https://git.hyperbola.info:50100/packages/community.git/plain/tlp/tlp.initd?id=241231d55f767d87e9cc883feb84b7f42a44434e") -sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' - '5dcf5721a129b3782c13fc453853c390c34e2ad4ee00706388ce014454b063ee' - 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' - '37495f08f2aeb934180c1fb0ef6528f8108a41b614be1fe4f596c783871ce68b' - '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646' - 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15' - '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf' - 'b80a38737be3a1112bc52d2474e8ece3adb405a92623cfb36c3df5aed99ebf51' - '24dc07139087bd2261eb2de268ae5228a37a4db4fc695a7d9e647d95c36044df' - 'a65d8c3a0210e4ec336f6b19900122d3a27c097893773aaf5c7de91d96399b36' - 'cb49240e32b5bb22d7764890e765c94276ec66b597caeacd5121618f614c3bec' - '28dbefc67b332712273047ff0a5776b379217368f9a572665b43c2f486591058' - '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' - 'b48fd8ef0c4e64ca3f3ada72e8e2148a276f86bf3cbb1a165504058bd15385c1' - '27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa' - '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7' - 'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6' - 'a55216d5bc267004ebfd16f3371acaf04953b9cfdbc55518b26c80492584f647' - 'fc2ff6922c4b64686bba9c6f482a64b2bebc1156d63e09f49adb0ffcfb240a1c' - '10428455ffe5812d45d9008f1cacbb5351b71566faf6329b8101ba71e213d36a') - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - local _sed_args=() - sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \ - -e 's|/var/run|/run|g' \ - -e 's|/usr/sbin|/usr/bin|g' \ - -e 's|/sbin|/usr/bin|g' \ - -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_acpid-openrc() { - pkgdesc="OpenRC acpid init script" - depends=('openrc' 'acpid') - backup=('etc/conf.d/acpid') - - _inst_confd 'acpid' - _inst_initd 'acpid' -} - -package_alsa-utils-openrc() { - pkgdesc="OpenRC alsa-utils init script" - depends=('openrc' 'alsa-utils') - backup=('etc/conf.d/alsasound') - - _inst_confd 'alsasound' - _inst_initd 'alsasound' -} - -package_avahi-openrc() { - pkgdesc="OpenRC avahi init script" - depends=('avahi' 'dbus-openrc') - - _inst_initd 'avahi-daemon' - _inst_initd 'avahi-dnsconfd' - - install -Dm755 autoipd-openrc.sh ${pkgdir}/usr/lib/netifrc/net/autoipd.sh -} - -package_bluez-openrc() { - pkgdesc="OpenRC bluez init script" - depends=('bluez' 'openrc') - - _inst_initd 'bluetoothd' -} - -package_displaymanager-openrc() { - pkgdesc="OpenRC display manager init script" - depends=('xorg-server' 'xorg-xinit' 'openrc') - backup=('etc/conf.d/xdm') - install=displaymanager.install - - _inst_confd 'xdm' - _inst_initd 'xdm' - _inst_initd 'xdm-setup' - - install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh" -} - -package_gpm-openrc() { - pkgdesc="OpenRC gpm init script" - depends=('openrc' 'gpm') - backup=('etc/conf.d/gpm') - - _inst_confd 'gpm' - _inst_initd 'gpm' -} - -package_wpa_supplicant-openrc() { - pkgdesc="OpenRC wpa_supplicant init script" - depends=('openrc' 'wpa_supplicant') - backup=('etc/conf.d/wpa_supplicant') - - _inst_confd 'wpa_supplicant' - _inst_initd 'wpa_supplicant' - - install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" - - sed -e "s|gentoo-release|parabola-release|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh" -} - -package_chrony-openrc() { - pkgdesc="OpenRC chrony init script" - depends=('openrc' 'chrony') - backup=('etc/conf.d/chronyd') - - _inst_confd 'chronyd' - sed -e 's|ARGS=".*"|ARGS=""|' \ - -e 's|CFGFILE=".*"|CFGFILE="/etc/chrony.conf"|' \ - -i "${pkgdir}/etc/conf.d/chronyd" - - _inst_initd 'chronyd' - sed -e 's|/sbin|/usr/bin|' \ - -e 's|/etc/chrony/|/etc/|' \ - -i "${pkgdir}/etc/init.d/chronyd" -} - -package_tlp-openrc() { - pkgdesc="OpenRC tlp init script" - depends=('openrc' 'tlp') - - _inst_initd 'tlp' - sed -e 's|/usr/sbin|/usr/bin|' \ - -e 's|/sbin/openrc-run|/usr/bin/openrc-run|' \ - -i "${pkgdir}/etc/init.d/tlp" -} diff --git a/nonsystemd/openrc-desktop/acpid.confd b/nonsystemd/openrc-desktop/acpid.confd deleted file mode 100644 index 9aadb4c..0000000 --- a/nonsystemd/openrc-desktop/acpid.confd +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/conf.d/acpid: config file for /etc/init.d/acpid - -# Options to pass to the acpid daemon. -# See the acpid(8) man page for more info. - -ACPID_ARGS="" diff --git a/nonsystemd/openrc-desktop/acpid.initd b/nonsystemd/openrc-desktop/acpid.initd deleted file mode 100644 index f8076d4..0000000 --- a/nonsystemd/openrc-desktop/acpid.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" -command="/usr/sbin/acpid" -command_args="${ACPID_ARGS}" -description="Daemon for Advanced Configuration and Power Interface" - -depend() { - need localmount - use logger -} - -reload() { - ebegin "Reloading acpid configuration" - start-stop-daemon --exec $command --signal HUP - eend $? -} diff --git a/nonsystemd/openrc-desktop/autoipd-openrc.sh b/nonsystemd/openrc-desktop/autoipd-openrc.sh deleted file mode 100644 index 7490852..0000000 --- a/nonsystemd/openrc-desktop/autoipd-openrc.sh +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2004-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# Contributed by Sven Wegener (swegener@gentoo.org) - -_config_vars="$_config_vars autoipd" - -autoipd_depend() { - program /usr/bin/avahi-autoipd - after interface -} - -autoipd_start() { - _exists true || return 1 - - eval args=\$autoipd_${IFVAR} - - ebegin "Starting avahi-autoipd" - /usr/bin/avahi-autoipd --daemonize --syslog --wait ${args} "${IFACE}" - eend "${?}" || return 1 - - _show_address - - return 0 -} - -autoipd_stop() { - /usr/bin/avahi-autoipd --check --syslog "${IFACE}" || return 0 - - ebegin "Stopping avahi-autoipd" - /usr/bin/avahi-autoipd --kill --syslog "${IFACE}" - eend "${?}" -} diff --git a/nonsystemd/openrc-desktop/avahi-daemon.initd b/nonsystemd/openrc-desktop/avahi-daemon.initd deleted file mode 100644 index 3db5529..0000000 --- a/nonsystemd/openrc-desktop/avahi-daemon.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - before netmount nfsmount - use net - need dbus -} - -start() { - ebegin "Starting avahi-daemon" - /usr/bin/avahi-daemon -D - eend $? -} - -stop() { - ebegin "Stopping avahi-daemon" - /usr/bin/avahi-daemon -k - eend $? -} - -reload() { - ebegin "Reloading avahi-daemon" - /usr/bin/avahi-daemon -r - eend $? -} diff --git a/nonsystemd/openrc-desktop/avahi-dnsconfd.initd b/nonsystemd/openrc-desktop/avahi-dnsconfd.initd deleted file mode 100644 index 1389a28..0000000 --- a/nonsystemd/openrc-desktop/avahi-dnsconfd.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - need avahi-daemon - use net -} - -start() { - ebegin "Starting avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -D - eend $? -} - -stop() { - ebegin "Stopping avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -k - eend $? -} - -reload() { - ebegin "Reloading avahi-dnsconfd" - /usr/bin/avahi-dnsconfd -r - eend $? -} diff --git a/nonsystemd/openrc-desktop/bluetoothd.initd b/nonsystemd/openrc-desktop/bluetoothd.initd deleted file mode 100644 index a3d02e5..0000000 --- a/nonsystemd/openrc-desktop/bluetoothd.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/run/bluetoothd.pid" -command="/usr/lib/bluetooth/bluetoothd" -command_background=1 - -depend() { - after coldplug - need dbus localmount hostname -} diff --git a/nonsystemd/openrc-desktop/displaymanager.install b/nonsystemd/openrc-desktop/displaymanager.install deleted file mode 100644 index dfd82b3..0000000 --- a/nonsystemd/openrc-desktop/displaymanager.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo " ==> Edit /etc/conf.d/xdm to set DM." -} diff --git a/nonsystemd/openrc-desktop/startDM.sh b/nonsystemd/openrc-desktop/startDM.sh deleted file mode 100644 index 489a739..0000000 --- a/nonsystemd/openrc-desktop/startDM.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -. /etc/profile - -. /etc/init.d/functions.sh - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -export SVCNAME=xdm -EXEC="$(get_options service)" -NAME="$(get_options name)" -PIDFILE="$(get_options pidfile)" -START_STOP_ARGS="$(get_options start_stop_args)" - -start-stop-daemon --start --exec ${EXEC} \ -${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \ -eerror "ERROR: could not start the Display Manager" - -# vim:ts=4 diff --git a/nonsystemd/openrc-desktop/xdm-setup.initd b/nonsystemd/openrc-desktop/xdm-setup.initd deleted file mode 100644 index 05f41a9..0000000 --- a/nonsystemd/openrc-desktop/xdm-setup.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount -} - -start() { - if get_bootparam "nox" ; then - touch /etc/.noxdm - fi -} diff --git a/nonsystemd/openrc-desktop/xdm.confd b/nonsystemd/openrc-desktop/xdm.confd deleted file mode 100644 index f6ebd0b..0000000 --- a/nonsystemd/openrc-desktop/xdm.confd +++ /dev/null @@ -1,10 +0,0 @@ -# We always try and start X on a static VT. The various DMs normally default -# to using VT7. If you wish to use the xdm init script, then you should ensure -# that the VT checked is the same VT your DM wants to use. We do this check to -# ensure that you haven't accidentally configured something to run on the VT -# in your /etc/inittab file so that you don't get a dead keyboard. -CHECKVT=7 - -# What display manager do you use ? [ xdm | gdm | sddm | gpe | entrance | lightdm | lxdm ] -# NOTE: If this is set in /etc/rc.conf, that setting will override this one. -DISPLAYMANAGER="xdm" diff --git a/nonsystemd/openrc-desktop/xdm.initd b/nonsystemd/openrc-desktop/xdm.initd deleted file mode 100644 index 545aea1..0000000 --- a/nonsystemd/openrc-desktop/xdm.initd +++ /dev/null @@ -1,132 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 - -depend() { - need localmount xdm-setup - - # this should start as early as possible - after bootmisc consolefont modules netmount - after readahead-list ypbind autofs openvpn gpm lircmd - after quota keymaps - before alsasound - - # Start before X - use elogind dbus xfs -} - -setup_dm() { - local MY_XDM - - MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') - - NAME= - case "${MY_XDM}" in - entrance*) - EXE=/usr/bin/entrance - PIDFILE=/run/entrance.pid - ;; - gdm|gnome) - EXE=/usr/bin/gdm - PIDFILE=/run/gdm/gdm.pid - START_STOP_ARGS="--background" - AUTOCLEAN_CGROUP="yes" - ;; - wdm) - EXE=/usr/bin/wdm - PIDFILE= - ;; - gpe) - EXE=/usr/bin/gpe-dm - PIDFILE=/run/gpe-dm.pid - ;; - lxdm) - EXE=/usr/bin/lxdm-binary - PIDFILE=/run/lxdm.pid - START_STOP_ARGS="--background" - ;; - lightdm) - EXE=/usr/bin/lightdm - PIDFILE=/run/lightdm.pid - START_STOP_ARGS="--background" - ;; - sddm) - EXE="/usr/bin/sddm" - START_STOP_ARGS="-m --background" - PIDFILE=/run/sddm.pid - ;; - *) - # first find out if there is such executable - EXE="$(command -v ${MY_XDM} 2>/dev/null)" - PIDFILE="/run/${MY_XDM}.pid" - - # warn user that he is doing sick things if the exe was not found - if [ -z "${EXE}" ]; then - echo "ERROR: Your XDM value is invalid." - echo " No ${MY_XDM} executable could be found on your system." - fi - ;; - esac - - if ! [ -x "${EXE}" ]; then - EXE=/usr/bin/xdm - PIDFILE=/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ]; then - echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," - echo " or install x11-apps/xdm package" - eend 255 - fi - fi -} - -start() { - local EXE NAME PIDFILE AUTOCLEAN_CGROUP - setup_dm - - if [ -f /etc/.noxdm ]; then - einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." - rm /etc/.noxdm - return 0 - fi - - ebegin "Setting up ${EXE##*/}" - - # save the prefered DM - save_options "service" "${EXE}" - save_options "name" "${NAME}" - save_options "pidfile" "${PIDFILE}" - save_options "start_stop_args" "${START_STOP_ARGS}" - save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}" - - /etc/X11/startDM.sh - eend 0 -} - -stop() { - local retval - - retval=0 - - local myexe myname mypidfile myservice - myexe=$(get_options "service") - myname=$(get_options "name") - mypidfile=$(get_options "pidfile") - myservice=${myexe##*/} - yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup") - - [ -z "${myexe}" ] && return 0 - - ebegin "Stopping ${myservice}" - - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then - start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ - ${mypidfile:+--pidfile} ${mypidfile} \ - ${myname:+--name} ${myname} - retval=${?} - fi - - eend ${retval} "Error stopping ${myservice}" - return ${retval} -} - -# vim: set ts=4 : From d3a8184031a04595a57537b0f7dd1b79596c3813 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 18 2022 05:16:03 +0000 Subject: [PATCH 17/200] updpkg: nonsystemd/polkit 121-1.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/polkit/PKGBUILD b/nonsystemd/polkit/PKGBUILD index 133fcb7..d7d01e0 100644 --- a/nonsystemd/polkit/PKGBUILD +++ b/nonsystemd/polkit/PKGBUILD @@ -1,64 +1,62 @@ -# Maintainer: David P. -# Maintainer (Arch): Jan de Groot +# Maintainer: Nathan Owens +# Contributor: Jan de Groot pkgname=polkit -pkgver=0.118 +pkgver=121 pkgrel=1 pkgrel+=.nonsystemd1 pkgdesc="Application development toolkit for controlling system-wide privileges" -arch=(x86_64 i686 armv7h) +url="https://gitlab.freedesktop.org/polkit/polkit" +arch=(x86_64) +arch+=(i686 armv7h) license=(LGPL) -url="https://www.freedesktop.org/wiki/Software/polkit/" -depends=(glib2 pam expat elogind js78) -makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive) +depends=(glib2 pam expat elogind js78 duktape) +makedepends=(meson gtk-doc gobject-introspection git) +checkdepends=(python-dbusmock) +provides=(libpolkit-{agent,gobject}-1.so) backup=(etc/pam.d/polkit-1) -provides=(polkit-elogind) -replaces=(polkit-elogind polkit-consolekit) -_commit=ff4c2144f0fb1325275887d9e254117fcd8a1b52 # git tag 0.118 +options=(debug) +_commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db # tags/121 source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit" '99-parabola.rules' - 'elogind-configure-fix.patch') -sha256sums=('SKIP' - 'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb' - 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b') + meson-0.61.diff) +b2sums=('SKIP' + 'd320d928b5480b5b8143717e6f88101912709020efc9583fbb233a2cc11aff51d36226b94cf69104db06f330e04d4dcfd6e4c7b027df75a3c72c43adec625fb2' + '29cef1cf9265ec0b70bf5a46655ee51b9855ce64e47636809b9704ca80edaf5777060d7469eea15a4126791d9290d44901726b6496acf83e41f46a96fe137ead') pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' + cd polkit + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } prepare() { - cd $pkgname - patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch - NOCONFIGURE=1 ./autogen.sh + cd polkit } build() { - cd $pkgname + local meson_options=( + -D examples=true + -D gtk_doc=true + -D man=true + -D os_type=redhat + -D session_tracking=libelogind + -D tests=true + -D systemdsystemunitdir=foo + ) - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib \ - --enable-libsystemd-login=no --disable-static \ - --enable-libelogind=yes --with-systemdsystemunitdir=no \ - --enable-gtk-doc --with-os-type=redhat - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make + arch-meson polkit build "${meson_options[@]}" + meson compile -C build } check() { - cd $pkgname - make -k check || : + meson test -C build --print-errorlogs -t 3 } package() { - cd $pkgname - make DESTDIR="$pkgdir" install \ - dbusconfdir=/usr/share/dbus-1/system.d \ - rulesdir=/usr/share/polkit-1/rules.d + meson install -C build --destdir "$pkgdir" install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d + mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" < -Date: Wed, 11 Apr 2018 13:14:14 +0200 -Subject: [PATCH] configure: fix elogind support - -HAVE_LIBSYSTEMD is used to determine which source files to use. -We have to check if either have_libsystemd or have_libelogind is -true, as both of these need the source files which are used when -HAVE_LIBSYSTEMD is true. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 36df239..da47ecb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ - - AC_SUBST(LIBSYSTEMD_CFLAGS) - AC_SUBST(LIBSYSTEMD_LIBS) --AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd]) -+AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd]) - - dnl --------------------------------------------------------------------------- - dnl - systemd unit / service files --- -2.17.0 diff --git a/nonsystemd/polkit/meson-0.61.diff b/nonsystemd/polkit/meson-0.61.diff new file mode 100644 index 0000000..70f17c5 --- /dev/null +++ b/nonsystemd/polkit/meson-0.61.diff @@ -0,0 +1,24 @@ +diff --git i/actions/meson.build w/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- i/actions/meson.build ++++ w/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git i/src/examples/meson.build w/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- i/src/examples/meson.build ++++ w/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, From 8eb5f4abcd65b72f6195c8b00511e8728b3a3d40 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Jul 19 2022 01:58:51 +0000 Subject: [PATCH 18/200] libre: linux-libre-64: Add rationale for the package While the package is well documented for potential users (the pkgdesc field is clear enough), it has almost zero documentation for potential contributors, and the fact that pkgdesc is generated doesn't help making it use clear. This adds some documentation to help maintenance, and also documents some use cases, as a potential user can easily understand why to use or not use such kernel, but this can be less clear to contributors wanting to modify/remove/replace the package in ways that could break these use cases. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD index 6891979..f93d67f 100644 --- a/libre/linux-libre-64/PKGBUILD +++ b/libre/linux-libre-64/PKGBUILD @@ -1,5 +1,55 @@ # Maintainers: Parabola hackers +# Rationale: This package enables to run 64bit kernels with 32bit rootfs. +# +# For armv7k/aarch64, we have no aarch64 port yet, and the 32bit +# kernels don't work for 64bit computers (for instance the dtb for +# 64bit computers are not shipped). +# +# In turn if we can boot Parabola on these computers, it enables +# people to work on an aarch64 port more easily as chrooting in 64bit +# rootfs from 32bit rootfs work when we have a 64bit kernel (tested on +# an x86_64 computer with a Parabola i686 rootfs and a Parabola x86_64 +# chroot). +# +# This enable to make rootfs that work on both 64bit and 32bit +# computers. In that case the user will still need to select the right +# kernel at boot. +# +# Generally speaking it also enable users to benefit from many of the +# improvements of 64bit kernels (ability to chroot in 64bit rootfs, +# better security, 4GiB address space per process instead of 3GiB for +# 32bit rootfs, etc) without having to reinstall everything. In +# addition, there was and is still no conversion guide to convert a +# 32bit Parabola installation to 64bit), and in some cases (lot of +# self-built software in /usr/local, PostgreSQL database, etc) the +# migration to 64bit requires some work. +# +# As for using i686 for new installation on x86_64 computers, it can +# enable people doing that to find and fix bugs on Parabola i686 to +# enable people with 32bit-only computers (like Libreboot compatible +# I945 Thinkpads) to still be able to use Parabola. +# +# Having both architectures (arm and x86) in the same PKGBUILD enables +# to more widely test this package (if we find issues on x86, they'll +# most likely apply to arm as well). Though it can become a problem if +# we need different kernel versions for both architectures. +# +# Status: +# - Tested on both arm and x86. +# - The build is currently broken on ARM due to a missing cross +# compiler for armv7h (it was accidentally removed and it doesn't +# build anymore). +# - External modules (like Wireguard or tp_smapi) also need to be +# cross compiled. So modules for linux-libre-64 need to be added +# (like tp_smapi-64) and dkms packages need to be adapted to also +# work for this kernel. +# - Some software (like building Guix) break with 32bit rootfs and +# 64bit kernels due to wrong assumption about the number of bits, +# through other software (like building rust with mrustc) work +# better (here because we have 3GiB instead of 3GiB of memory per +# process). Most software is not affected though. + # Based on the linux-libre package _replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix From 905728e4e1fdc1db2d09a97e0b94ab7fb59b4369 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 02:39:55 +0000 Subject: [PATCH 19/200] addpkg: nonsystemd/dbus-openrc 20210418-2 Signed-off-by: David P --- diff --git a/nonsystemd/dbus-openrc/80-dbus b/nonsystemd/dbus-openrc/80-dbus new file mode 100644 index 0000000..81f830e --- /dev/null +++ b/nonsystemd/dbus-openrc/80-dbus @@ -0,0 +1,12 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="$(which dbus-launch 2>/dev/null)" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -n "$command" ]; then + command="$dbuslaunch --exit-with-session $command" + else + eval $($dbuslaunch --sh-syntax --exit-with-session) + fi +fi diff --git a/nonsystemd/dbus-openrc/PKGBUILD b/nonsystemd/dbus-openrc/PKGBUILD new file mode 100644 index 0000000..cfae7f1 --- /dev/null +++ b/nonsystemd/dbus-openrc/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: artoo + +pkgname=dbus-openrc +pkgver=20210418 +pkgrel=2 +pkgdesc="OpenRC dbus init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +depends=('dbus' 'openrc') +provides=('init-dbus') +conflicts=('init-dbus') +source=('dbus.initd' + 'dbus-reload.hook' + '80-dbus') +sha256sums=('3801358d1fe65db3711851c4a2d7c491c8750c899d8effdf37eb64d34683e91b' + '517cb12a30f84ba9580532d5485ce219ad96668480db99fcd4954c7017a0ea47' + '6d637acae40368db9e7c005b2e53483882014caef281fe9e801633ba7cc3b7dd') + +package() { + install -Dm755 "${srcdir}"/dbus.initd "${pkgdir}"/etc/init.d/dbus + + install -d "${pkgdir}"/etc/runlevels/default + ln -sf /etc/init.d/dbus "${pkgdir}"/etc/runlevels/default/dbus + + install -Dt "${pkgdir}"/usr/share/libalpm/hooks -m644 *.hook + + install -Dm755 "${srcdir}"/80-dbus "${pkgdir}"/etc/X11/xinit/xinitrc.d/80-dbus.sh +} diff --git a/nonsystemd/dbus-openrc/dbus-reload.hook b/nonsystemd/dbus-openrc/dbus-reload.hook new file mode 100644 index 0000000..296ab08 --- /dev/null +++ b/nonsystemd/dbus-openrc/dbus-reload.hook @@ -0,0 +1,13 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = etc/dbus-1/system.d/*.conf +Target = usr/share/dbus-1/system.d/*.conf +Target = usr/share/dbus-1/system-services/*.service + +[Action] +Description = Reloading system bus configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/openrc-hook reload dbus diff --git a/nonsystemd/dbus-openrc/dbus.initd b/nonsystemd/dbus-openrc/dbus.initd new file mode 100644 index 0000000..c5d799d --- /dev/null +++ b/nonsystemd/dbus-openrc/dbus.initd @@ -0,0 +1,36 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 or later + +supervisor=supervise-daemon +description="An IPC message bus daemon" +command="/usr/bin/dbus-daemon" +command_args="--system" +command_args_foreground="--nofork --nopidfile" +extra_started_commands="reload" + +dbus_socket="/run/dbus/system_bus_socket" + +depend() { + need localmount + after bootmisc +} + +start_pre() { + /usr/bin/dbus-uuidgen --ensure=/etc/machine-id + + # We need to test if /run/dbus exists, since script will fail if it does not + checkpath -q -d "/run/dbus" +} + +stop_post() { + [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}" +} + +reload() { + ebegin "Reloading D-BUS messagebus config" + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + eend $? +} From c92203b32e1e69c76a3939d4a5d71c0e7254e655 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 02:40:04 +0000 Subject: [PATCH 20/200] addpkg: nonsystemd/networkmanager-openrc 20210505-6 Signed-off-by: David P --- diff --git a/nonsystemd/networkmanager-openrc/10-openrc-status b/nonsystemd/networkmanager-openrc/10-openrc-status new file mode 100644 index 0000000..f046586 --- /dev/null +++ b/nonsystemd/networkmanager-openrc/10-openrc-status @@ -0,0 +1,36 @@ +#!/bin/sh +# Copyright (c) 2012 Alexandre Rostovtsev +# Released under the 2-clause BSD license. + +# Ensures that the NetworkManager OpenRC service is marked as started and +# providing net only when it has a successful connection. + +if [ ! -e "/run/openrc/softlevel" ]; then + # OpenRC is not running + exit 0 +fi + +# Ensure rc-service is in PATH +PATH="${PATH}:/usr/bin:/usr/sbin" + +# Exit if the NetworkManager OpenRC service is not running +rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0 + +# Call rc-service in background mode so that the start/stop functions update +# NetworkManager service status to started or inactive instead of actually +# starting or stopping the daemon + +export IN_BACKGROUND=YES + +case "$2" in + up) nm-online -t 0 -x && + ! rc-service NetworkManager status 2>&1 | grep -q started && + exec rc-service NetworkManager start ;; + down) nm-online -t 0 -x || + rc-service NetworkManager status 2>&1 | grep -q stopped || + exec rc-service NetworkManager stop ;; + pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped || + exec rc-service NetworkManager stop ;; +esac +exit 0 +# vim: set ts=4: diff --git a/nonsystemd/networkmanager-openrc/NetworkManager.confd b/nonsystemd/networkmanager-openrc/NetworkManager.confd new file mode 100644 index 0000000..4a99229 --- /dev/null +++ b/nonsystemd/networkmanager-openrc/NetworkManager.confd @@ -0,0 +1,4 @@ +# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT +# seconds after starting, the service will be marked as inactive, and it will +# continue to wait for a connection in background mode. +INACTIVE_TIMEOUT=1 diff --git a/nonsystemd/networkmanager-openrc/NetworkManager.initd b/nonsystemd/networkmanager-openrc/NetworkManager.initd new file mode 100644 index 0000000..4829618 --- /dev/null +++ b/nonsystemd/networkmanager-openrc/NetworkManager.initd @@ -0,0 +1,64 @@ +#!/usr/bin/openrc-run +# Copyright (c) 2008 Saleem Abdulrasool +# Copyright 2013-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="NetworkManager daemon. The service is marked as started only \ +when a network connection is established." +# supervisor="supervise-daemon" +# command="/usr/bin/NetworkManager" +# command_args="-n" +# pidfile="/run/NetworkManager/NetworkManager.pid" + +depend() { + need dbus + use logind + provide net +} + +start_pre() { + checkpath -q -d -m 0755 /run/NetworkManager +} + +start() { + # If we are re-called by a dispatcher event, we want to mark the service + # as started without starting the daemon again + yesno "${IN_BACKGROUND}" && return 0 + + [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" + + ebegin "Starting NetworkManager" + start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ + --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid + local _retval=$? + eend "${_retval}" + if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then + einfo "Marking NetworkManager as inactive. It will automatically be marked" + einfo "as started after a network connection has been established." + mark_service_inactive + fi + return "${_retval}" +} + +stop() { + # If we are re-called by a dispatcher event, we want to mark the service + # as inactive without stopping the daemon + if yesno "${IN_BACKGROUND}"; then + mark_service_inactive "${SVCNAME}" + return 0 + fi + + ebegin "Stopping NetworkManager" + local pidfile=/run/NetworkManager/NetworkManager.pid + if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then + # Try stopping the pid file used by <0.9.7 + pidfile=/var/run/NetworkManager.pid + start-stop-daemon --stop --quiet --pidfile "${pidfile}" + ret=$? + [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" + eend ${ret} + else + start-stop-daemon --stop --quiet --pidfile "${pidfile}" + eend $? + fi +} diff --git a/nonsystemd/networkmanager-openrc/PKGBUILD b/nonsystemd/networkmanager-openrc/PKGBUILD new file mode 100644 index 0000000..be97bce --- /dev/null +++ b/nonsystemd/networkmanager-openrc/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: artoo + +pkgname=networkmanager-openrc +pkgver=20210505 +pkgrel=6 +pkgdesc="OpenRC networkmanager init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-networkmanager') +depends=('openrc' 'networkmanager') +conflicts=('init-networkmanager') +backup=('etc/conf.d/NetworkManager') +source=("NetworkManager".{initd,confd} + '10-openrc-status') +sha256sums=('eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4' + '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' + 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe') + +package() { + install -Dm755 "${srcdir}"/NetworkManager.initd "${pkgdir}"/etc/init.d/NetworkManager + install -Dm644 "${srcdir}"/NetworkManager.confd "${pkgdir}"/etc/conf.d/NetworkManager + + install -Dm755 "${srcdir}"/10-openrc-status "${pkgdir}"/etc/NetworkManager/dispatcher.d/10-openrc-status +} From d941b0752e36fca122a3c4bd26322b4669daed9a Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 04:42:50 +0000 Subject: [PATCH 21/200] updpkg: nonsystemd/dbus 1.14.0-1.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/dbus/PKGBUILD b/nonsystemd/dbus/PKGBUILD index 565beb0..c8f7d20 100644 --- a/nonsystemd/dbus/PKGBUILD +++ b/nonsystemd/dbus/PKGBUILD @@ -1,40 +1,33 @@ -# Maintainer: David P. -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Contributor (Arch): Jan de Groot -# Contributor (Arch): Tom Gundersen -# Contributor (Arch): Link Dupont - -pkgname=dbus -pkgver=1.12.20 +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Tom Gundersen +# Contributor: Link Dupont + +pkgbase=dbus +pkgname=(dbus dbus-docs) +pkgver=1.14.0 pkgrel=1 -pkgrel+=.nonsystemd2 +pkgrel+=.nonsystemd1 pkgdesc="Freedesktop.org message bus system" url="https://wiki.freedesktop.org/www/Software/dbus/" arch=(x86_64) arch+=(i686 armv7h) license=(GPL custom) depends=(libx11 libelogind expat audit) -depends+=(libelogind.so libaudit.so) makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive) -provides=(libdbus libdbus-1.so) -provides+=(dbus-elogind dbus-openrc) -conflicts=(libdbus dbus-elogind dbus-openrc) -replaces=(${conflicts[@]}) source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver" dbus-enable-elogind.patch - no-fatal-warnings.diff - dbus-reload.hook - dbus.initd) + no-fatal-warnings.diff) sha256sums=('SKIP' 'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0' - '6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e' - '1335a86bb5eb68614bf13af314f1a7f5f6f68253584986e9c5b492a4585ab722' - '9964aa935b4a7d64f5970bcfcd561b06013a85ae2712444bc4c5f644364dab3b') + 'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie prepare() { cd dbus + patch -Np 1 -i ../dbus-enable-elogind.patch + # Allow us to enable checks without them being fatal patch -Np1 -i ../no-fatal-warnings.diff @@ -48,6 +41,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0 \ + --runstatedir=/run \ --with-console-auth-dir=/run/console/ \ --with-dbus-user=dbus \ --with-system-pid-file=/run/dbus/pid \ @@ -67,10 +61,15 @@ build() { } check() { - make -C dbus check + make -C dbus -j1 check } -package() { +package_dbus() { + depends+=(libelogind.so libaudit.so) + provides=(libdbus libdbus-1.so) + conflicts=(libdbus) + replaces=(libdbus) + DESTDIR="$pkgdir" make -C dbus install rm -r "$pkgdir"/{etc,var} @@ -79,14 +78,20 @@ package() { echo 'u dbus 81 "System Message Bus"' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf" + # Split docs + mkdir -p doc/usr/share + mv {"$pkgdir",doc}/usr/share/doc + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING +} + +package_dbus-docs() { + pkgdesc+=" (documentation)" + depends=() - # Remove docs - rm -r "$pkgdir/usr/share/doc" + mv doc/* "$pkgdir" - # Init script - install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook - install -Dm755 "$srcdir/dbus.initd" "$pkgdir/etc/init.d/dbus" - install -d "${pkgdir}/etc/runlevels/default" - ln -sf "/etc/init.d/dbus" "${pkgdir}/etc/runlevels/default/dbus" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING } + +# vim:set sw=2 et: diff --git a/nonsystemd/dbus/dbus-reload.hook b/nonsystemd/dbus/dbus-reload.hook deleted file mode 100644 index 400b650..0000000 --- a/nonsystemd/dbus/dbus-reload.hook +++ /dev/null @@ -1,13 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = etc/dbus-1/system.d/*.conf -Target = usr/share/dbus-1/system.d/*.conf -Target = usr/share/dbus-1/system-services/*.service - -[Action] -Description = Reloading system bus configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/openrc-hook reload dbus diff --git a/nonsystemd/dbus/dbus.initd b/nonsystemd/dbus/dbus.initd deleted file mode 100644 index 8c4ad24..0000000 --- a/nonsystemd/dbus/dbus.initd +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License, v2 or later - -extra_started_commands="reload" - -description="An IPC message bus daemon" -pidfile="/run/dbus/pid" -command="/usr/bin/dbus-daemon" -command_args="--system" - -dbus_socket="/run/dbus/system_bus_socket" - -depend() { - need localmount - after bootmisc -} - -start_pre() { - /usr/bin/dbus-uuidgen --ensure=/etc/machine-id - - # We need to test if /run/dbus exists, since script will fail if it does not - checkpath -q -d "/run/dbus" -} - -stop_post() { - [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}" -} - -reload() { - ebegin "Reloading D-BUS messagebus config" - dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - eend $? -} diff --git a/nonsystemd/dbus/no-fatal-warnings.diff b/nonsystemd/dbus/no-fatal-warnings.diff index 459da90..69fa78e 100644 --- a/nonsystemd/dbus/no-fatal-warnings.diff +++ b/nonsystemd/dbus/no-fatal-warnings.diff @@ -1,10 +1,10 @@ diff --git i/dbus/dbus-internals.c w/dbus/dbus-internals.c -index 267aef97..b1064e85 100644 +index ab498b15..cf86f4ae 100644 --- i/dbus/dbus-internals.c +++ w/dbus/dbus-internals.c -@@ -185,7 +185,7 @@ const char *_dbus_no_memory_message = "Not enough memory"; - - static dbus_bool_t warn_initted = FALSE; +@@ -193,7 +193,7 @@ static dbus_bool_t warn_initted = FALSE; + * threads, the worst that will happen is that warnings get their default + * fatal/non-fatal nature. */ static dbus_bool_t fatal_warnings = FALSE; -static dbus_bool_t fatal_warnings_on_check_failed = TRUE; +static dbus_bool_t fatal_warnings_on_check_failed = FALSE; From f36f26c6cb658f8a602e77360bbcdf4c4d2b9044 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 06:08:24 +0000 Subject: [PATCH 22/200] updpkg: nonsystemd/networkmanager 1.38.2-2.nonsystemd1 Signed-off-by: David P --- diff --git a/nonsystemd/networkmanager/10-openrc-status b/nonsystemd/networkmanager/10-openrc-status deleted file mode 100644 index f046586..0000000 --- a/nonsystemd/networkmanager/10-openrc-status +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Copyright (c) 2012 Alexandre Rostovtsev -# Released under the 2-clause BSD license. - -# Ensures that the NetworkManager OpenRC service is marked as started and -# providing net only when it has a successful connection. - -if [ ! -e "/run/openrc/softlevel" ]; then - # OpenRC is not running - exit 0 -fi - -# Ensure rc-service is in PATH -PATH="${PATH}:/usr/bin:/usr/sbin" - -# Exit if the NetworkManager OpenRC service is not running -rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0 - -# Call rc-service in background mode so that the start/stop functions update -# NetworkManager service status to started or inactive instead of actually -# starting or stopping the daemon - -export IN_BACKGROUND=YES - -case "$2" in - up) nm-online -t 0 -x && - ! rc-service NetworkManager status 2>&1 | grep -q started && - exec rc-service NetworkManager start ;; - down) nm-online -t 0 -x || - rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; - pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; -esac -exit 0 -# vim: set ts=4: diff --git a/nonsystemd/networkmanager/NetworkManager.confd b/nonsystemd/networkmanager/NetworkManager.confd deleted file mode 100644 index 4a99229..0000000 --- a/nonsystemd/networkmanager/NetworkManager.confd +++ /dev/null @@ -1,4 +0,0 @@ -# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT -# seconds after starting, the service will be marked as inactive, and it will -# continue to wait for a connection in background mode. -INACTIVE_TIMEOUT=1 diff --git a/nonsystemd/networkmanager/NetworkManager.initd b/nonsystemd/networkmanager/NetworkManager.initd deleted file mode 100644 index 4829618..0000000 --- a/nonsystemd/networkmanager/NetworkManager.initd +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright (c) 2008 Saleem Abdulrasool -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="NetworkManager daemon. The service is marked as started only \ -when a network connection is established." -# supervisor="supervise-daemon" -# command="/usr/bin/NetworkManager" -# command_args="-n" -# pidfile="/run/NetworkManager/NetworkManager.pid" - -depend() { - need dbus - use logind - provide net -} - -start_pre() { - checkpath -q -d -m 0755 /run/NetworkManager -} - -start() { - # If we are re-called by a dispatcher event, we want to mark the service - # as started without starting the daemon again - yesno "${IN_BACKGROUND}" && return 0 - - [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" - - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid - local _retval=$? - eend "${_retval}" - if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then - einfo "Marking NetworkManager as inactive. It will automatically be marked" - einfo "as started after a network connection has been established." - mark_service_inactive - fi - return "${_retval}" -} - -stop() { - # If we are re-called by a dispatcher event, we want to mark the service - # as inactive without stopping the daemon - if yesno "${IN_BACKGROUND}"; then - mark_service_inactive "${SVCNAME}" - return 0 - fi - - ebegin "Stopping NetworkManager" - local pidfile=/run/NetworkManager/NetworkManager.pid - if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then - # Try stopping the pid file used by <0.9.7 - pidfile=/var/run/NetworkManager.pid - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - ret=$? - [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" - eend ${ret} - else - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - eend $? - fi -} diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD index dc667e6..4061ccf 100644 --- a/nonsystemd/networkmanager/PKGBUILD +++ b/nonsystemd/networkmanager/PKGBUILD @@ -1,39 +1,35 @@ -# Maintainer: David P. -# Maintainer (Arch): Jan Alexander Steffens (heftig) -# Maintainer (Arch): Jan de Groot -# Contributor (Arch): Wael Nasreddine -# Contributor (Arch): Tor Krill -# Contributor (Arch): Will Rea -# Contributor (Arch): Valentine Sinitsyn +# Maintainer: Nathan Owens +# Contributor: Jan de Groot +# Contributor: Wael Nasreddine +# Contributor: Tor Krill +# Contributor: Will Rea +# Contributor: Valentine Sinitsyn pkgbase=networkmanager pkgname=(networkmanager libnm nm-cloud-setup) -pkgver=1.32.2 -pkgrel=1 +pkgver=1.38.2 +pkgrel=2 pkgrel+=.nonsystemd1 pkgdesc="Network connection manager and user applications" -url="https://wiki.gnome.org/Projects/NetworkManager" +url="https://networkmanager.dev/" arch=(x86_64) arch+=(i686 armv7h) -license=(GPL2) +license=(GPL) _pppver=2.4.9 makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl - logind libmm-glib libnewt libndp libteam nftables vala perl-yaml + elogind libmm-glib libnewt libndp libteam nftables vala perl-yaml python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq openresolv libpsl audit meson) checkdepends=(libx11 python-dbus) -_commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902 # tags/1.20.6^0 -source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit" - NetworkManager.{confd,initd} 10-openrc-status) -sha256sums=('SKIP' - '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' - 'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4' - 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe') +options=(debug) +_commit=abfd2d6ea729926bff0ddafa1367a54f6d6f4230 # tags/1.38.2^0 +source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit") +b2sums=('SKIP') pkgver() { cd NetworkManager - git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g' + git describe --tags | sed 's/-dev/dev/;s/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -41,7 +37,7 @@ prepare() { } build() { - local meson_args=( + local meson_options=( # system paths -D dbus_conf_dir=/usr/share/dbus-1/system.d @@ -50,7 +46,6 @@ build() { -D session_tracking_consolekit=false -D suspend_resume=elogind -D modify_system=true - -D polkit_agent=true -D selinux=false -D systemdsystemunitdir=no -D session_tracking=elogind @@ -79,7 +74,7 @@ build() { -D qt=false ) - arch-meson NetworkManager build "${meson_args[@]}" + arch-meson NetworkManager build "${meson_options[@]}" meson compile -C build } @@ -98,21 +93,22 @@ _pick() { } package_networkmanager() { - depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl + depends=(libnm iproute2 wpa_supplicant libmm-glib libnewt libndp libteam curl bluez-libs libpsl audit mobile-broadband-provider-info elogind) - optdepends=('dnsmasq: connection sharing' - 'nftables: connection sharing' - 'iptables: connection sharing' - 'bluez: Bluetooth support' - 'ppp: dialup connection support' - 'modemmanager: cellular network support' - 'iwd: wpa_supplicant alternative' - 'dhclient: alternative DHCP client' - 'dhcpcd: alternative DHCP client' - 'openresolv: alternative resolv.conf manager' - 'firewalld: firewall support') - provides=($pkgname-{elogind,openrc}) - replaces=($pkgname-{elogind,openrc}) + optdepends=( + 'polkit: let non-root users control networking' + 'dnsmasq: connection sharing' + 'nftables: connection sharing' + 'iptables: connection sharing' + 'bluez: Bluetooth support' + 'ppp: dialup connection support' + 'modemmanager: cellular network support' + 'iwd: wpa_supplicant alternative' + 'dhclient: alternative DHCP client' + 'dhcpcd: alternative DHCP client' + 'openresolv: alternative resolv.conf manager' + 'firewalld: firewall support' + ) backup=(etc/NetworkManager/NetworkManager.conf) meson install -C build --destdir "$pkgdir" @@ -125,6 +121,9 @@ package_networkmanager() { install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf < Date: Jul 19 2022 20:03:48 +0000 Subject: [PATCH 23/200] addpkg: nonsystemd/apparmor-openrc 20210506-1 Signed-off-by: David P --- diff --git a/nonsystemd/apparmor-openrc/PKGBUILD b/nonsystemd/apparmor-openrc/PKGBUILD new file mode 100644 index 0000000..fb6229c --- /dev/null +++ b/nonsystemd/apparmor-openrc/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: artoo + +pkgname=apparmor-openrc +pkgver=20210506 +pkgrel=1 +pkgdesc="OpenRC apparmor init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-apparmor') +depends=('openrc' 'apparmor') +conflicts=('init-apparmor') +source=("apparmor.initd") +sha256sums=('ba7601a738761a3f27278a7508ae32463f7097c597f0806931983ef6af2a5d3a') + +package() { + install -Dm755 "${srcdir}"/apparmor.initd "${pkgdir}"/etc/init.d/apparmor +} diff --git a/nonsystemd/apparmor-openrc/apparmor.initd b/nonsystemd/apparmor-openrc/apparmor.initd new file mode 100644 index 0000000..773aa53 --- /dev/null +++ b/nonsystemd/apparmor-openrc/apparmor.initd @@ -0,0 +1,91 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Load all configured profiles for the AppArmor security module." +description_reload="Reload all profiles" + +extra_started_commands="reload" + +aa_action() { + local arg=$1 + local return + + shift + $* + return=$? + + if [ ${return} -eq 0 ]; then + aa_log_success_msg $arg + else + aa_log_failure_msg arg + fi + + return $return +} + +aa_log_action_start() { + ebegin $1 +} + +aa_log_action_end() { + eend $1 +} + +aa_log_success_msg() { + einfo $1 +} + +aa_log_warning_msg() { + ewarn $1 +} + +aa_log_failure_msg() { + eerror $1 +} + +aa_log_skipped_msg() { + einfo $1 +} + +aa_log_daemon_msg() { + einfo $1 +} + +aa_log_end_msg() { + eend $1 +} + +. /usr/lib/apparmor/rc.apparmor.functions + +start() { + ebegin "Starting AppArmor" + eindent + + if ! is_apparmor_loaded ; then + load_module + if [ $? -ne 0 ]; then + eerror "AppArmor kernel support is not present" + eend 1 + return 1 + fi + fi + + parse_profiles load + + eoutdent +} + +stop() { + ebegin "Stopping AppArmor" + eindent + apparmor_stop + eoutdent +} + +reload() { + # todo: split out clean_profiles into its own function upstream + # so we can do parse_profiles reload && clean_profiles + # and do a proper reload instead of restart + apparmor_restart +} From 13c126ab91c49bd7ad41b6946de56e5d7b008557 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 20:20:56 +0000 Subject: [PATCH 24/200] addpkg: nonsystemd/firewalld-openrc 20210505-1 Signed-off-by: David P --- diff --git a/nonsystemd/firewalld-openrc/PKGBUILD b/nonsystemd/firewalld-openrc/PKGBUILD new file mode 100644 index 0000000..0ee6d8f --- /dev/null +++ b/nonsystemd/firewalld-openrc/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: David P. +# Maintainer (Artix): Nathan Owens +# Submitter (Artix): alium@artixlinux.org + +pkgname=firewalld-openrc +pkgver=20210505 +pkgrel=1 +pkgdesc="OpenRC firewalld init script" +arch=('any') +url="https://gitea.artixlinux.org/packagesF/firewalld-openrc" +license=('GPL2') +groups=('openrc-galaxy') +provides=('init-firewalld') +conflicts=('init-firewalld') +backup=('etc/conf.d/firewalld') +source=("firewalld.initd") +sha256sums=('53ed08a1e2a45fae27e3dd30022b91f71801092332d158af0467f78723d56fd1') + +package() { + depends=('openrc' 'firewalld') + install -Dm755 "$srcdir/firewalld.initd" "$pkgdir/etc/init.d/firewalld" +} diff --git a/nonsystemd/firewalld-openrc/firewalld.initd b/nonsystemd/firewalld-openrc/firewalld.initd new file mode 100644 index 0000000..0808b88 --- /dev/null +++ b/nonsystemd/firewalld-openrc/firewalld.initd @@ -0,0 +1,14 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="FirewallD" + +supervisor=supervise-daemon +command=/usr/sbin/firewalld +command_args="--nofork" + +depend() { + need dbus + provide firewall +} From 4c8a3124b2b91bb979c95c1c5a8d2206d6cd0b39 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 20:25:26 +0000 Subject: [PATCH 25/200] addpkg: nonsystemd/iptables-openrc 20210505-2 Signed-off-by: David P --- diff --git a/nonsystemd/iptables-openrc/PKGBUILD b/nonsystemd/iptables-openrc/PKGBUILD new file mode 100644 index 0000000..f60aa97 --- /dev/null +++ b/nonsystemd/iptables-openrc/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: David P. +# Maintainer (Artix): artoo + +pkgname=iptables-openrc +pkgver=20210505 +pkgrel=2 +pkgdesc="OpenRC iptables init script" +arch=('any') +url="https://gitea.artixlinux.org/artixlinux/packagesI/iptables-openrc" +license=('GPL2') +groups=('openrc-system') +provides=('init-iptables' 'ebtables-openrc') +conflicts=('init-iptables' 'ebtables-openrc') +backup=('etc/conf.d/iptables' + 'etc/conf.d/ip6tables') +source=("iptables.confd" + "ip6tables.confd" + "iptables.initd" + "ebtables.confd" + "ebtables.initd") +sha256sums=('7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6' + 'c1f5bb4ea36bb7c0a7b7abeb8169cb8547f43d348faef70c61f2daa9033c318b' + 'e5c6164a0ffa24501d5b3fa6425f0e24a2da73891b4dd62a25b083f9f5b731af' + 'c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58' + '6eb00de3cf18f36f909cb95f1aa345de16d1cd9c8b92acb944691ac720bf3cb5') + +package() { + depends=('openrc' 'iptables') + + for f in iptables ebtables; do + install -Dm755 "${srcdir}"/"$f".initd "${pkgdir}"/etc/init.d/"$f" + install -Dm644 "${srcdir}"/"$f".confd "${pkgdir}"/etc/conf.d/"$f" + done + + install -Dm644 "${srcdir}"/ip6tables.confd "${pkgdir}"/etc/conf.d/ip6tables + + install -Dm755 "${srcdir}"/iptables.initd "${pkgdir}"/etc/init.d/ip6tables + +} diff --git a/nonsystemd/iptables-openrc/ebtables.confd b/nonsystemd/iptables-openrc/ebtables.confd new file mode 100644 index 0000000..645b26e --- /dev/null +++ b/nonsystemd/iptables-openrc/ebtables.confd @@ -0,0 +1,11 @@ +# /etc/conf.d/ebtables + +# Location in which ebtables initscript will save set rules on +# service shutdown +EBTABLES_SAVE="/var/lib/ebtables/rules-save" + +# Options to pass to ebtables-save and ebtables-restore +SAVE_RESTORE_OPTIONS="" + +# Save state on stopping ebtables +SAVE_ON_STOP="yes" diff --git a/nonsystemd/iptables-openrc/ebtables.initd b/nonsystemd/iptables-openrc/ebtables.initd new file mode 100644 index 0000000..6608760 --- /dev/null +++ b/nonsystemd/iptables-openrc/ebtables.initd @@ -0,0 +1,101 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="save panic" +extra_started_commands="reload" + +ebtables_bin="/sbin/ebtables" +ebtables_save=${EBTABLES_SAVE} + +depend() { + before net + use logger +} + +ebtables_tables() { + for table in filter nat broute; do + if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then + printf '%s' "${table} " + fi + done +} + +set_table_policy() { + local chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + broute) chains="BROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + local chain + for chain in ${chains} ; do + ${ebtables_bin} -t ${table} -P ${chain} ${policy} + done +} + +checkconfig() { + if [ ! -f ${ebtables_save} ] ; then + eerror "Not starting ebtables. First create some rules then run:" + eerror "/etc/init.d/ebtables save" + return 1 + fi + return 0 +} + +start() { + checkconfig || return 1 + ebegin "Loading ebtables state and starting bridge firewall" + ${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + ebegin "Stopping bridge firewall" + local a + for a in $(ebtables_tables); do + set_table_policy $a ACCEPT + + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? +} + +reload() { + ebegin "Flushing bridge firewall" + local a + for a in $(ebtables_tables); do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + done + eend $? + + start +} + +save() { + ebegin "Saving ebtables state" + touch "${ebtables_save}" + chmod 0600 "${ebtables_save}" + ${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}" + eend $? +} + +panic() { + service_started ebtables && svc_stop + + local a + ebegin "Dropping all packets forwarded on bridges" + for a in $(ebtables_tables); do + ${ebtables_bin} -t $a -F + ${ebtables_bin} -t $a -X + + set_table_policy $a DROP + done + eend $? +} diff --git a/nonsystemd/iptables-openrc/ip6tables.confd b/nonsystemd/iptables-openrc/ip6tables.confd new file mode 100644 index 0000000..e608f41 --- /dev/null +++ b/nonsystemd/iptables-openrc/ip6tables.confd @@ -0,0 +1,27 @@ +# /etc/conf.d/ip6tables + +# Set wait option for xtables lock in seconds +# DEFAULT: 60 +#IPTABLES_LOCK_WAIT_TIME="60" + +# Set wait interval option for xtables lock in microseconds +# DEFAULT: 1000 +#IPTABLES_LOCK_WAIT_INTERVAL="1000" + +# Location in which ip6tables initscript will save set rules on +# service shutdown +IP6TABLES_SAVE="/var/lib/ip6tables/rules-save" + +# Options to pass to ip6tables-save and ip6tables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping ip6tables +SAVE_ON_STOP="yes" + +# If you need to log ip6tables messages as soon as ip6tables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/nonsystemd/iptables-openrc/iptables.confd b/nonsystemd/iptables-openrc/iptables.confd new file mode 100644 index 0000000..7225374 --- /dev/null +++ b/nonsystemd/iptables-openrc/iptables.confd @@ -0,0 +1,19 @@ +# /etc/conf.d/iptables + +# Location in which iptables initscript will save set rules on +# service shutdown +IPTABLES_SAVE="/var/lib/iptables/rules-save" + +# Options to pass to iptables-save and iptables-restore +SAVE_RESTORE_OPTIONS="-c" + +# Save state on stopping iptables +SAVE_ON_STOP="yes" + +# If you need to log iptables messages as soon as iptables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/nonsystemd/iptables-openrc/iptables.initd b/nonsystemd/iptables-openrc/iptables.initd new file mode 100644 index 0000000..3dcabb0 --- /dev/null +++ b/nonsystemd/iptables-openrc/iptables.initd @@ -0,0 +1,165 @@ +#!/sbin/openrc-run +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="check save panic" +extra_started_commands="reload" + +iptables_lock_wait_time=${IPTABLES_LOCK_WAIT_TIME:-"60"} +iptables_lock_wait_interval=${IPTABLES_LOCK_WAIT_INTERVAL:-"1000"} + +iptables_name=${SVCNAME} +case ${iptables_name} in + iptables|ip6tables) ;; + *) iptables_name="iptables" ;; +esac + +iptables_bin="/sbin/${iptables_name}" +case ${iptables_name} in + iptables) iptables_proc="/proc/net/ip_tables_names" + iptables_save=${IPTABLES_SAVE};; + ip6tables) iptables_proc="/proc/net/ip6_tables_names" + iptables_save=${IP6TABLES_SAVE};; +esac + +depend() { + need localmount #434774 + before net +} + +set_table_policy() { + local has_errors=0 chains table=$1 policy=$2 + case ${table} in + nat) chains="PREROUTING POSTROUTING OUTPUT";; + mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";; + filter) chains="INPUT FORWARD OUTPUT";; + *) chains="";; + esac + + local chain + for chain in ${chains} ; do + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -t ${table} -P ${chain} ${policy} + [ $? -ne 0 ] && has_errors=1 + done + + return ${has_errors} +} + +checkkernel() { + if [ ! -e ${iptables_proc} ] ; then + eerror "Your kernel lacks ${iptables_name} support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} + +checkconfig() { + if [ -z "${iptables_save}" -o ! -f "${iptables_save}" ] ; then + eerror "Not starting ${iptables_name}. First create some rules then run:" + eerror "/etc/init.d/${iptables_name} save" + return 1 + fi + return 0 +} + +start_pre() { + checkconfig || return 1 +} + +start() { + ebegin "Loading ${iptables_name} state and starting firewall" + ${iptables_bin}-restore --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +stop_pre() { + checkkernel || return 1 +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + + ebegin "Stopping firewall" + local has_errors=0 a + for a in $(cat ${iptables_proc}) ; do + set_table_policy $a ACCEPT + [ $? -ne 0 ] && has_errors=1 + + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a + [ $? -ne 0 ] && has_errors=1 + + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a + [ $? -ne 0 ] && has_errors=1 + done + eend ${has_errors} +} + +reload() { + checkkernel || return 1 + checkrules || return 1 + ebegin "Flushing firewall" + local has_errors=0 a + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a + [ $? -ne 0 ] && has_errors=1 + + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a + [ $? -ne 0 ] && has_errors=1 + done + eend ${has_errors} + + start +} + +checkrules() { + ebegin "Checking rules" + ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}" + eend $? +} + +check() { + # Short name for users of init.d script. + checkrules +} + +save() { + ebegin "Saving ${iptables_name} state" + checkpath -q -d "$(dirname "${iptables_save}")" + checkpath -q -m 0600 -f "${iptables_save}" + ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}" + eend $? +} + +panic() { + # use iptables autoload capability to load at least all required + # modules and filter table + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -S >/dev/null + if [ $? -ne 0 ] ; then + eerror "${iptables_bin} failed to load" + return 1 + fi + + if service_started ${iptables_name}; then + rc-service ${iptables_name} stop + fi + + local has_errors=0 a + ebegin "Dropping all packets" + for a in $(cat ${iptables_proc}) ; do + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a + [ $? -ne 0 ] && has_errors=1 + + ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a + [ $? -ne 0 ] && has_errors=1 + + if [ "${a}" != "nat" ]; then + # The "nat" table is not intended for filtering, the use of DROP is therefore inhibited. + set_table_policy $a DROP + [ $? -ne 0 ] && has_errors=1 + fi + done + eend ${has_errors} +} From edf915dec7af1df0f0ee58eb9da42ccff3a6444d Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 20:28:40 +0000 Subject: [PATCH 26/200] addpkg: nonsystemd/nftables-openrc 20210505-2 Signed-off-by: David P --- diff --git a/nonsystemd/nftables-openrc/PKGBUILD b/nonsystemd/nftables-openrc/PKGBUILD new file mode 100644 index 0000000..bbb9289 --- /dev/null +++ b/nonsystemd/nftables-openrc/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: David P. +# Maintainer (Artix): artoo + +pkgname=nftables-openrc +pkgver=20210505 +pkgrel=2 +pkgdesc="OpenRC nftables init script" +arch=('any') +url="https://gitea.artixlinux.org/packagesN/nftables-openrc" +license=('GPL2') +groups=('openrc-world') +provides=('init-nftables') +conflicts=('init-nftables') +backup=('etc/conf.d/nftables' + 'etc/conf.d/nftables-mk') +source=("nftables"{,-mk}.{initd,confd} + "nftables"{,-mk}.sh) +sha256sums=('d99250bf4e54545d978041819b94ea27634ee1812e9b56f15f287ca68640dec8' + 'd5e3077345dfea02849a70aea220396322a10c3808f0303b988119adbc56fdbd' + '155be88ef6cddf95841f629264d8d4b42d15b4f7e8e572e5159e2cc17f8258b1' + '5ea765fce16e2ee6a760760a1cfde9994bef24e9a788ab83750e96ac2bc9533a' + 'e3b1423f877871c649e7da15352f2abb489900f05b022a87292ff92d36203b67' + '041b5fb2d42d6245459fd581a3b7ad39aa898caaefb2178595606b38391fc4db') + +package() { + depends=('openrc' 'nftables') + + for _i in nftables-mk nftables ; do + install -Dm755 "$srcdir/$_i.initd" "$pkgdir/etc/init.d/$_i" + install -Dm644 "$srcdir/$_i.confd" "$pkgdir/etc/conf.d/$_i" + done + install -Dm755 "$srcdir"/nftables-mk.sh "$pkgdir"/usr/lib/nftables/nftables-mk.sh + install -Dm755 "$srcdir"/nftables.sh "$pkgdir"/usr/lib/nftables/nftables.sh +} diff --git a/nonsystemd/nftables-openrc/nftables-mk.confd b/nonsystemd/nftables-openrc/nftables-mk.confd new file mode 100644 index 0000000..5cda240 --- /dev/null +++ b/nonsystemd/nftables-openrc/nftables-mk.confd @@ -0,0 +1,26 @@ +# /etc/conf.d/nftables + +# Location in which nftables initscript will save set rules on +# service shutdown +NFTABLES_SAVE="/var/lib/nftables/rules-save" + +# Options to pass to nft on save +SAVE_OPTIONS="-n" + +# Save state on stopping nftables +SAVE_ON_STOP="yes" + +# Only for OpenRC systems. +# Set to "hard" or "soft" to panic when stopping instead of +# clearing the rules +# Soft panic loads a ruleset dropping any new or invalid connections +# Hard panic loads a ruleset dropping all traffic +PANIC_ON_STOP="" + +# If you need to log nftables messages as soon as nftables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/nonsystemd/nftables-openrc/nftables-mk.initd b/nonsystemd/nftables-openrc/nftables-mk.initd new file mode 100644 index 0000000..ca0446c --- /dev/null +++ b/nonsystemd/nftables-openrc/nftables-mk.initd @@ -0,0 +1,104 @@ +#!/usr/bin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="check clear list panic save soft_panic" +extra_started_commands="reload" + +depend() { + need localmount #434774 + before net +} + +checkkernel() { + if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then + eerror "Your kernel lacks nftables support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} + +checkconfig() { + if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then + eerror "Not starting nftables. First create some rules then run:" + eerror "/etc/init.d/${SVCNAME} save" + return 1 + fi + return 0 +} + +start_pre() { + checkconfig || return 1 + checkkernel || return 1 + check || return 1 +} + +start() { + ebegin "Loading ${SVCNAME} state and starting firewall" + /usr/lib/nftables/nftables.sh load "${NFTABLES_SAVE}" + eend $? +} + +stop() { + if [ "${SAVE_ON_STOP}" = "yes" ] ; then + save || return 1 + fi + + ebegin "Stopping firewall" + if [ "${PANIC_ON_STOP}" = "hard" ]; then + /usr/lib/nftables/nftables.sh panic + elif [ "${PANIC_ON_STOP}" = "soft" ]; then + /usr/lib/nftables/nftables.sh soft_panic + else + /usr/lib/nftables/nftables.sh clear + fi + eend $? +} + +reload() { + start_pre || return 1 + start +} + +clear() { + ebegin "Clearing rules" + /usr/lib/nftables/nftables.sh clear + eend $? +} + +list() { + /usr/lib/nftables/nftables.sh list +} + +check() { + ebegin "Checking rules" + /usr/lib/nftables/nftables.sh check "${NFTABLES_SAVE}" + eend $? +} + +save() { + ebegin "Saving ${SVCNAME} state" + checkpath -q -d "$(dirname "${NFTABLES_SAVE}")" + checkpath -q -m 0600 -f "${NFTABLES_SAVE}" + /usr/lib/nftables/nftables.sh store "${NFTABLES_SAVE}" + eend $? +} + +panic() { + if service_started ${SVCNAME}; then + rc-service ${SVCNAME} zap + fi + ebegin "Dropping all packets" + /usr/lib/nftables/nftables.sh panic + eend $? +} + +soft_panic() { + if service_started ${SVCNAME}; then + rc-service ${SVCNAME} zap + fi + ebegin "Dropping new connections" + /usr/lib/nftables/nftables.sh soft_panic + eend $? +} diff --git a/nonsystemd/nftables-openrc/nftables-mk.sh b/nonsystemd/nftables-openrc/nftables-mk.sh new file mode 100644 index 0000000..27defe3 --- /dev/null +++ b/nonsystemd/nftables-openrc/nftables-mk.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +main() { + local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'} + case "$1" in + "check") + nft -c -f "${NFTABLES_SAVE}" + ;; + "clear") + nft flush ruleset + ;; + "list") + nft ${SAVE_OPTIONS} list ruleset + ;; + "load") + # We use an include because cat fails with long rulesets see #675188 + printf 'flush ruleset\ninclude "%s"\n' "${NFTABLES_SAVE}" | nft -f - + ;; + "panic") + panic hard | nft -f - + ;; + "soft_panic") + panic soft | nft -f - + ;; + "store") + local tmp_save="${NFTABLES_SAVE}.tmp" + umask 177 + ( + printf '#!/sbin/nft -f\nflush ruleset\n' + nft ${SAVE_OPTIONS} list ruleset + ) > "$tmp_save" && mv ${tmp_save} ${NFTABLES_SAVE} + ;; + esac +} + +panic() { + local erule; + [ "$1" = soft ] && erule="ct state established,related accept;" || erule=""; + cat </dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi + if nft create table ip6 filter >/dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip6 filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + clear + start +} + +save() { + ebegin "Saving nftables state" + checkpath -q -d "$(dirname "${NFTABLES_SAVE}")" + checkpath -q -m 0600 -f "${NFTABLES_SAVE}" + export SAVE_OPTIONS + /usr/lib/nftables/nftables.sh store ${NFTABLES_SAVE} + return $? +} + +start() { + ebegin "Loading nftables state and starting firewall" + clear + /usr/lib/nftables/nftables.sh load ${NFTABLES_SAVE} + eend $? +} + +stop() { + if yesno ${SAVE_ON_STOP:-yes}; then + save || return 1 + fi + + ebegin "Stopping firewall" + clear + eend $? +} + +checkconfig() { + if [ ! -f ${NFTABLES_SAVE} ]; then + eerror "Not starting nftables. First create some rules then run:" + eerror "rc-service nftables save" + return 1 + fi + return 0 +} + +checkkernel() { + if ! nft list tables >/dev/null 2>&1; then + eerror "Your kernel lacks nftables support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} diff --git a/nonsystemd/nftables-openrc/nftables.sh b/nonsystemd/nftables-openrc/nftables.sh new file mode 100644 index 0000000..557b454 --- /dev/null +++ b/nonsystemd/nftables-openrc/nftables.sh @@ -0,0 +1,150 @@ +#! /bin/sh + +main() { + local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'} + local retval + case "$1" in + "clear") + if ! use_legacy; then + nft flush ruleset + else + clear_legacy + fi + retval=$? + ;; + "list") + if ! use_legacy; then + nft list ruleset + else + list_legacy + fi + retval=$? + ;; + "load") + nft -f ${NFTABLES_SAVE} + retval=$? + ;; + "store") + umask 177 + local tmp_save="${NFTABLES_SAVE}.tmp" + if ! use_legacy; then + nft ${SAVE_OPTIONS} list ruleset > ${tmp_save} + else + save_legacy ${tmp_save} + fi + retval=$? + if [ ${retval} ]; then + mv ${tmp_save} ${NFTABLES_SAVE} + fi + ;; + esac + return ${retval} +} + +clear_legacy() { + local l3f line table chain first_line + + first_line=1 + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + table=$(echo ${line} | sed "s/table[ \t]*//") + deletetable ${l3f} ${table} + done + done + else + nft list tables | while read line; do + l3f=$(echo ${line} | cut -d ' ' -f2) + table=$(echo ${line} | cut -d ' ' -f3) + deletetable ${l3f} ${table} + done + fi +} + +list_legacy() { + local l3f + + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + echo "$(nft list ${line})" + done + done + else + nft list tables | while read line; do + echo "$(nft list ${line})" + done + fi +} + +save_legacy() { + tmp_save=$1 + touch "${tmp_save}" + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save} + done + done + else + nft list tables | while read line; do + nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}" + done + fi +} + +use_legacy() { + local major_ver minor_ver + + major_ver=$(uname -r | cut -d '.' -f1) + minor_ver=$(uname -r | cut -d '.' -f2) + + [ $major_ver -ge 4 -o $major_ver -eq 3 -a $minor_ver -ge 18 ] && return 1 + return 0 +} + +CHECK_TABLE_NAME="GENTOO_CHECK_TABLE" + +getfamilies() { + local l3f families + + for l3f in ip arp ip6 bridge inet; do + if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then + families="${families}${l3f} " + nft delete table ${l3f} ${CHECK_TABLE_NAME} + fi + done + echo ${families} +} + +manualwalk() { + local result l3f=`getfamilies | cut -d ' ' -f1` + + nft create table ${l3f} ${CHECK_TABLE_NAME} + nft list tables | read line + if [ $(echo $line | wc -w) -lt 3 ]; then + result=0 + fi + result=1 + nft delete table ${l3f} ${CHECK_TABLE_NAME} + + return $result +} + +deletetable() { + # family is $1 + # table name is $2 + nft flush table $1 $2 + nft list table $1 $2 | while read l; do + chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2) + if [ -n "${chain}" ]; then + nft flush chain $1 $2 ${chain} + nft delete chain $1 $2 ${chain} + fi + done + nft delete table $1 $2 +} + +main "$@" From bd0569a337ef9117341d1d1cc2b004df38072c16 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 21:04:37 +0000 Subject: [PATCH 27/200] Update openrc init scripts urls and add their depends as runtime dependencies By putting their dependencies inside their respective package() function, those deps are not installed at build, hence allowing me to build them indenpendently of openrc Signed-off-by: David P --- diff --git a/nonsystemd/acpid-openrc/PKGBUILD b/nonsystemd/acpid-openrc/PKGBUILD index 68f2293..f5d6f1b 100644 --- a/nonsystemd/acpid-openrc/PKGBUILD +++ b/nonsystemd/acpid-openrc/PKGBUILD @@ -1,6 +1,7 @@ -# Maintainer: Rafli Akmal -# Contributor: artoo -# Contributor: Oscar Campos +# Maintainer: David P. +# Maintainer (Artix): Rafli Akmal +# Contributor (Artix): artoo +# Contributor (Artix): Oscar Campos pkgname=acpid-openrc @@ -8,11 +9,10 @@ pkgver=20210506 pkgrel=1 pkgdesc="OpenRC acpid init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesA/acpid-openrc" license=('GPL2') groups=('openrc-galaxy') provides=('init-acpid') -depends=('openrc' 'acpid') conflicts=('init-acpid') backup=('etc/conf.d/acpid') source=("acpid.confd" @@ -21,6 +21,7 @@ sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba' 'c784a8b8ceceb3a453808a860a8dd9e0f8847f96cc82a7cc8410bc682aaadb06') package() { + depends=('openrc' 'acpid') install -Dm755 "$srcdir/acpid.initd" "$pkgdir/etc/init.d/acpid" install -Dm644 "$srcdir/acpid.confd" "$pkgdir/etc/conf.d/acpid" } diff --git a/nonsystemd/alsa-utils-openrc/PKGBUILD b/nonsystemd/alsa-utils-openrc/PKGBUILD index 397a9bf..d15ec56 100644 --- a/nonsystemd/alsa-utils-openrc/PKGBUILD +++ b/nonsystemd/alsa-utils-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=alsa-utils-openrc pkgver=20210505 pkgrel=2 pkgdesc="OpenRC alsa-utils init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesA/alsa-utils-openrc" license=('GPL2') groups=('openrc-world') provides=('init-alsa-utils') -depends=('openrc' 'alsa-utils') conflicts=('init-alsa-utils') backup=('etc/conf.d/alsasound') source=("alsasound.confd" @@ -18,6 +18,7 @@ sha256sums=('d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43' '40c9f0e8d00b88ebd28bba9dcd91323549a77aeda12a5a86c532bddca7dae8d1') package() { + depends=('openrc' 'alsa-utils') install -Dm755 "${srcdir}"/alsasound.initd "${pkgdir}"/etc/init.d/alsasound install -Dm644 "${srcdir}"/alsasound.confd "${pkgdir}"/etc/conf.d/alsasound } diff --git a/nonsystemd/apparmor-openrc/PKGBUILD b/nonsystemd/apparmor-openrc/PKGBUILD index fb6229c..57c1c35 100644 --- a/nonsystemd/apparmor-openrc/PKGBUILD +++ b/nonsystemd/apparmor-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=apparmor-openrc pkgver=20210506 pkgrel=1 pkgdesc="OpenRC apparmor init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesA/apparmor-openrc" license=('GPL2') groups=('openrc-world') provides=('init-apparmor') -depends=('openrc' 'apparmor') conflicts=('init-apparmor') source=("apparmor.initd") sha256sums=('ba7601a738761a3f27278a7508ae32463f7097c597f0806931983ef6af2a5d3a') package() { + depends=('openrc' 'apparmor') install -Dm755 "${srcdir}"/apparmor.initd "${pkgdir}"/etc/init.d/apparmor } diff --git a/nonsystemd/avahi-openrc/PKGBUILD b/nonsystemd/avahi-openrc/PKGBUILD index 593faab..06912c6 100644 --- a/nonsystemd/avahi-openrc/PKGBUILD +++ b/nonsystemd/avahi-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=avahi-openrc pkgver=20210505 pkgrel=2 pkgdesc="OpenRC avahi init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesA/avahi-openrc" license=('GPL2') groups=('openrc-world') provides=('init-avahi') -depends=('avahi' 'openrc') conflicts=('init-avahi') source=('avahi-daemon.initd' 'avahi-dnsconfd.initd' @@ -19,6 +19,7 @@ sha256sums=('0e6513b19d79edfe8d3a124e15fe48ee3cfa073fa93971c2265d82c4df7caa10' '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf') package() { + depends=('avahi' 'openrc') install -Dm755 "${srcdir}"/avahi-daemon.initd "${pkgdir}"/etc/init.d/avahi-daemon install -Dm755 "${srcdir}"/avahi-dnsconfd.initd "${pkgdir}"/etc/init.d/avahi-dnsconfd diff --git a/nonsystemd/bluez-openrc/PKGBUILD b/nonsystemd/bluez-openrc/PKGBUILD index aacf01d..19ba05e 100644 --- a/nonsystemd/bluez-openrc/PKGBUILD +++ b/nonsystemd/bluez-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=bluez-openrc pkgver=20210506 pkgrel=1 pkgdesc="OpenRC bluez init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesB/bluez-openrc" license=('GPL2') groups=('openrc-world') provides=('init-bluez') -depends=('bluez' 'openrc') conflicts=('init-bluez') source=("bluetoothd.initd") sha256sums=('b99147767d339b0d6707bbd8cd4da51e795835b7519e7d6d2fcf70dabcaeeb9a') package() { + depends=('bluez' 'openrc') install -Dm755 "${srcdir}"/bluetoothd.initd "${pkgdir}"/etc/init.d/bluetoothd } diff --git a/nonsystemd/chrony-openrc/PKGBUILD b/nonsystemd/chrony-openrc/PKGBUILD index 546e25c..d7db1d4 100644 --- a/nonsystemd/chrony-openrc/PKGBUILD +++ b/nonsystemd/chrony-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: Nathan Owens +# Maintainer: David P. +# Maintainer (Artix): Nathan Owens pkgname=chrony-openrc pkgver=20210506 pkgrel=2 pkgdesc="OpenRC chrony init" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesC/chrony-openrc" license=('GPL2') groups=('openrc-galaxy') provides=('init-chrony' 'init-timed') -depends=('openrc' 'chrony') conflicts=('init-chrony' 'init-timed') backup=('etc/conf.d/chrony') source=("chrony.confd" @@ -21,6 +21,7 @@ b2sums=('496483539b15a55c15287178b7df730fe33fe8d7ceda164f362c0dd6cd833bbee84a0a0 package() { + depends=('openrc' 'chrony') install -Dm755 "${srcdir}"/chrony.initd "${pkgdir}"/etc/init.d/chrony install -Dm644 "${srcdir}"/chrony.confd "${pkgdir}"/etc/conf.d/chrony } diff --git a/nonsystemd/dbus-openrc/PKGBUILD b/nonsystemd/dbus-openrc/PKGBUILD index cfae7f1..0086e38 100644 --- a/nonsystemd/dbus-openrc/PKGBUILD +++ b/nonsystemd/dbus-openrc/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=dbus-openrc pkgver=20210418 pkgrel=2 pkgdesc="OpenRC dbus init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesD/dbus-openrc" license=('GPL2') -depends=('dbus' 'openrc') provides=('init-dbus') conflicts=('init-dbus') source=('dbus.initd' @@ -18,6 +18,7 @@ sha256sums=('3801358d1fe65db3711851c4a2d7c491c8750c899d8effdf37eb64d34683e91b' '6d637acae40368db9e7c005b2e53483882014caef281fe9e801633ba7cc3b7dd') package() { + depends=('dbus' 'openrc') install -Dm755 "${srcdir}"/dbus.initd "${pkgdir}"/etc/init.d/dbus install -d "${pkgdir}"/etc/runlevels/default diff --git a/nonsystemd/docker-openrc/PKGBUILD b/nonsystemd/docker-openrc/PKGBUILD index 4996452..30e55b0 100644 --- a/nonsystemd/docker-openrc/PKGBUILD +++ b/nonsystemd/docker-openrc/PKGBUILD @@ -1,16 +1,16 @@ -# Maintainer: Rafli Akmal -# Contributor: artoo -# Contributor: Oscar Campos +# Maintainer: David P. +# Maintainer (Artix): Rafli Akmal +# Contributor (Artix): artoo +# Contributor (Artix): Oscar Campos pkgname=docker-openrc pkgver=20210505 pkgrel=1 pkgdesc="OpenRC docker init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesD/docker-openrc" license=('GPL2') groups=('openrc-galaxy') -depends=('openrc' 'docker') provides=('init-docker') conflicts=('init-docker') backup=('etc/conf.d/docker') @@ -20,6 +20,7 @@ sha256sums=('3f661c0032dda93d448f138308b1d70b35ef9297bc43816891bbcd1ab5d7cc5e' 'd891f5ba66b5a8dd472b7b19db774af7a22a7a1c0766cb57c3422c098a82c493') package() { - install -Dm755 "$srcdir/docker.initd" "$pkgdir/etc/init.d/docker" - install -Dm644 "$srcdir/docker.confd" "$pkgdir/etc/conf.d/docker" + depends=('openrc' 'docker') + install -Dm755 "$srcdir/docker.initd" "$pkgdir/etc/init.d/docker" + install -Dm644 "$srcdir/docker.confd" "$pkgdir/etc/conf.d/docker" } diff --git a/nonsystemd/firewalld-openrc/PKGBUILD b/nonsystemd/firewalld-openrc/PKGBUILD index 0ee6d8f..d07eb31 100644 --- a/nonsystemd/firewalld-openrc/PKGBUILD +++ b/nonsystemd/firewalld-openrc/PKGBUILD @@ -12,7 +12,6 @@ license=('GPL2') groups=('openrc-galaxy') provides=('init-firewalld') conflicts=('init-firewalld') -backup=('etc/conf.d/firewalld') source=("firewalld.initd") sha256sums=('53ed08a1e2a45fae27e3dd30022b91f71801092332d158af0467f78723d56fd1') diff --git a/nonsystemd/gdm-openrc/PKGBUILD b/nonsystemd/gdm-openrc/PKGBUILD index 1d0c925..7d94d79 100644 --- a/nonsystemd/gdm-openrc/PKGBUILD +++ b/nonsystemd/gdm-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=gdm-openrc pkgver=20220104 pkgrel=1 pkgdesc="OpenRC gdm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesG/gdm-openrc" license=('GPL2') groups=('openrc-world') provides=('init-displaymanager') -depends=('gdm' 'openrc') conflicts=('init-displaymanager') source=("gdm.initd") sha256sums=('b46bb53bf9eb0c8d292133216af3c451060e8acc278e837d2bb5a58d548baec0') package() { + depends=('gdm' 'openrc') install -Dm755 "$srcdir/gdm.initd" "$pkgdir/etc/init.d/gdm" } diff --git a/nonsystemd/gpm-openrc/PKGBUILD b/nonsystemd/gpm-openrc/PKGBUILD index 55f8487..d75d115 100644 --- a/nonsystemd/gpm-openrc/PKGBUILD +++ b/nonsystemd/gpm-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=gpm-openrc pkgver=20210505 pkgrel=2 pkgdesc="OpenRC gpm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesG/gpm-openrc" license=('GPL2') groups=('openrc-system') provides=('init-gpm') -depends=('openrc' 'gpm') conflicts=('init-gpm') backup=('etc/conf.d/gpm') source=("gpm.confd" @@ -18,6 +18,7 @@ sha256sums=('73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8' 'b0a698c19a699b66375b39ad10e59a1e565c67b4c2dbf281f571d185654cf711') package() { + depends=('openrc' 'gpm') install -Dm755 "${srcdir}"/gpm.initd "${pkgdir}"/etc/init.d/gpm install -Dm755 "${srcdir}"/gpm.confd "${pkgdir}"/etc/conf.d/gpm } diff --git a/nonsystemd/lightdm-openrc/PKGBUILD b/nonsystemd/lightdm-openrc/PKGBUILD index 9ed003a..557bd4d 100644 --- a/nonsystemd/lightdm-openrc/PKGBUILD +++ b/nonsystemd/lightdm-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=lightdm-openrc pkgver=20220104 pkgrel=1 pkgdesc="OpenRC lightdm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesL/lightdm-openrc" license=('GPL2') groups=('openrc-world') provides=('init-displaymanager') -depends=('lightdm' 'openrc') conflicts=('init-displaymanager') source=("lightdm.initd") sha256sums=('a33a505b49088a5d5c8388da03c826e40699694fcbfd22775b15a957a07880dc') package() { + depends=('lightdm' 'openrc') install -Dm755 "$srcdir/lightdm.initd" "$pkgdir/etc/init.d/lightdm" } diff --git a/nonsystemd/lxdm-openrc/PKGBUILD b/nonsystemd/lxdm-openrc/PKGBUILD index 46c5ae8..63749e4 100644 --- a/nonsystemd/lxdm-openrc/PKGBUILD +++ b/nonsystemd/lxdm-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=lxdm-openrc pkgver=20220104 pkgrel=1 pkgdesc="OpenRC lxdm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesL/lxdm-openrc" license=('GPL2') groups=('openrc-galaxy') provides=('init-displaymanager') -depends=('lxdm-gtk3' 'openrc') conflicts=('init-displaymanager') source=("lxdm.initd") sha256sums=('57ec70f482e606961971978565fc268fba9388b277ce751c2d0a16f44d081e42') package() { + depends=('lxdm-gtk3' 'openrc') install -Dm755 "$srcdir/lxdm.initd" "$pkgdir/etc/init.d/lxdm" } diff --git a/nonsystemd/networkmanager-openrc/PKGBUILD b/nonsystemd/networkmanager-openrc/PKGBUILD index be97bce..67fc8ab 100644 --- a/nonsystemd/networkmanager-openrc/PKGBUILD +++ b/nonsystemd/networkmanager-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=networkmanager-openrc pkgver=20210505 pkgrel=6 pkgdesc="OpenRC networkmanager init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesN/networkmanager-openrc" license=('GPL2') groups=('openrc-world') provides=('init-networkmanager') -depends=('openrc' 'networkmanager') conflicts=('init-networkmanager') backup=('etc/conf.d/NetworkManager') source=("NetworkManager".{initd,confd} @@ -19,6 +19,7 @@ sha256sums=('eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4' 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe') package() { + depends=('openrc' 'networkmanager') install -Dm755 "${srcdir}"/NetworkManager.initd "${pkgdir}"/etc/init.d/NetworkManager install -Dm644 "${srcdir}"/NetworkManager.confd "${pkgdir}"/etc/conf.d/NetworkManager diff --git a/nonsystemd/sddm-openrc/PKGBUILD b/nonsystemd/sddm-openrc/PKGBUILD index 4c61228..662665e 100644 --- a/nonsystemd/sddm-openrc/PKGBUILD +++ b/nonsystemd/sddm-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=sddm-openrc pkgver=20220104 pkgrel=1 pkgdesc="OpenRC sddm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesS/sddm-openrc" license=('GPL2') groups=('openrc-world') provides=('init-displaymanager') -depends=('sddm' 'openrc') conflicts=('init-displaymanager') source=("sddm.initd") sha256sums=('0d24660f022b3e5e1f8196a4022981045d9dd79eb74531d19d6981a5ba735f1e') package() { + depends=('sddm' 'openrc') install -Dm755 "$srcdir/sddm.initd" "$pkgdir/etc/init.d/sddm" } diff --git a/nonsystemd/tlp-openrc/PKGBUILD b/nonsystemd/tlp-openrc/PKGBUILD index 63887b0..b669a0c 100644 --- a/nonsystemd/tlp-openrc/PKGBUILD +++ b/nonsystemd/tlp-openrc/PKGBUILD @@ -1,21 +1,22 @@ -# Maintainer: Rafli Akmal -# Contributor: artoo -# Contributor: Oscar Campos +# Maintainer: David P. +# Maintainer (Artix): Rafli Akmal +# Contributor (Artix): artoo +# Contributor (Artix): Oscar Campos pkgname=tlp-openrc pkgver=20210505 pkgrel=1 pkgdesc="OpenRC tlp init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesT/tlp-openrc" license=('GPL2') groups=('openrc-galaxy') -depends=('openrc' 'tlp') provides=('init-tlp') conflicts=('init-tlp') source=('tlp.initd') sha256sums=('4fc771f1ce9423b1f5facc006845d3ab5cbce3bfdf1aa0737b2ed8e7d6f8c3ac') package() { + depends=('openrc' 'tlp') install -Dm755 "$srcdir/tlp.initd" "$pkgdir/etc/init.d/tlp" } diff --git a/nonsystemd/wpa_supplicant-openrc/PKGBUILD b/nonsystemd/wpa_supplicant-openrc/PKGBUILD index 042de61..12e75c0 100644 --- a/nonsystemd/wpa_supplicant-openrc/PKGBUILD +++ b/nonsystemd/wpa_supplicant-openrc/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=wpa_supplicant-openrc pkgver=20210505 pkgrel=1 pkgdesc="OpenRC wpa_supplicant init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesW/wpa_supplicant-openrc" license=('GPL2') groups=('openrc-system') provides=('init-wpa_supplicant') -depends=('openrc' 'wpa_supplicant') conflicts=('init-wpa_supplicant') backup=('etc/conf.d/wpa_supplicant') source=("wpa_supplicant.confd" @@ -20,6 +20,7 @@ sha256sums=('27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa' '300d0b54280c2582e74f78087edad3b0da19b9e4e0440f7f320f523a46da8373') package() { + depends=('openrc' 'wpa_supplicant') install -Dm755 "${srcdir}"/wpa_supplicant.initd "${pkgdir}"/etc/init.d/wpa_supplicant install -Dm644 "${srcdir}"/wpa_supplicant.confd "${pkgdir}"/etc/conf.d/wpa_supplicant diff --git a/nonsystemd/xdm-openrc/PKGBUILD b/nonsystemd/xdm-openrc/PKGBUILD index 41d0054..fbd950d 100644 --- a/nonsystemd/xdm-openrc/PKGBUILD +++ b/nonsystemd/xdm-openrc/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer: artoo +# Maintainer: David P. +# Maintainer (Artix): artoo pkgname=xdm-openrc pkgver=20220104 pkgrel=1 pkgdesc="OpenRC xdm init script" arch=('any') -url="https://gitea.artixlinux.org/artixlinux/packages-openrc" +url="https://gitea.artixlinux.org/packagesX/xdm-openrc" license=('GPL2') groups=('openrc-world') provides=('init-xdm') -depends=('xorg-xdm' 'openrc') conflicts=('init-xdm') source=("xdm.initd") sha256sums=('d0ec3cf9ca3a010e3ef6e36b66c98bbb1102d9f203a595b642c554952f71d467') package() { + depends=('xorg-xdm' 'openrc') install -Dm755 "$srcdir/xdm.initd" "$pkgdir/etc/init.d/xdm" } From 42a7bac0d20df41301480c9452b14b8a56ce1545 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 19 2022 21:07:52 +0000 Subject: [PATCH 28/200] drop openrc-security Signed-off-by: David P --- diff --git a/nonsystemd/openrc-security/PKGBUILD b/nonsystemd/openrc-security/PKGBUILD deleted file mode 100644 index ca68559..0000000 --- a/nonsystemd/openrc-security/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# Maintainer: David P. -# Maintainer: Omar Vega Ramos -# Contributor: Luke Shumaker - -pkgver=20201202 -_commit=bfce6ac47f7b46a3d89a73b9a24c196713914d83 -_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}" - -pkgbase=openrc-security -pkgname=('apparmor-openrc' - 'iptables-openrc' - 'shorewall-openrc' - 'shorewall6-openrc' - 'firewalld-openrc' - 'nftables-openrc') -pkgrel=2 -pkgdesc="OpenRC init scripts" -arch=('any') -url="https://github.com/gentoo/gentoo" -license=('GPL2') -groups=('openrc-security') -source=("iptables.confd::${_url}/net-firewall/iptables/files/iptables-1.4.13.confd" - "ip6tables.confd::${_url}/net-firewall/iptables/files/ip6tables-1.4.13.confd" - "iptables.initd::${_url}/net-firewall/iptables/files/iptables.init" - "ebtables.confd::${_url}/net-firewall/ebtables/files/ebtables.confd-r1" - "ebtables.initd::${_url}/net-firewall/ebtables/files/ebtables.initd-r1" - "firewalld.initd::${_url}/net-firewall/firewalld/files/firewalld.init" - "apparmor.initd::${_url}/sys-apps/apparmor/files/apparmor-init" - "shorewall.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3" - "shorewall.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1" - "shorewall6.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3" - "shorewall6.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1" - "nftables.shd::${_url}/net-firewall/nftables/files/libexec/nftables.sh" - "nftables.confd::${_url}/net-firewall/nftables/files/nftables.confd" - "nftables.initd::${_url}/net-firewall/nftables/files/nftables.init" -) -sha512sums=('bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70' - '8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e' - '317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db' - '088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3' - 'ceceaf33d6f6bfa89a5d81932e3ec76a26d09d67150efd3de587520ea47984f618d4fc55e799c58a2e5e236caec5bd81e2fde31a7e5aa328e629cdabbd29339b' - '457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e' - '4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148' - '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771' - 'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b' - '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771' - 'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b' - '6cb1ac0928ae2da5c69764d45c52a661a6d72698bb9edd6a603580d2f9bd82b59f2a2661e7569ade3a3b729459d115004f251ad6a5eac8cdf1d38c65bfa9349e' - '8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144' - 'ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661') - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - local _sed_args=() - sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \ - -e 's|/var/run|/run|g' \ - -e 's|/sbin|/usr/bin|g' \ - -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_iptables-openrc() { - pkgdesc="OpenRC iptables init script" - depends=('openrc' 'iptables') - backup=('etc/conf.d/iptables' - 'etc/conf.d/ip6tables' - 'etc/conf.d/ebtables') - - _inst_confd 'iptables' - _inst_initd 'iptables' - - _inst_confd 'ebtables' - _inst_initd 'ebtables' - - _inst_confd 'ip6tables' - - install -Dm755 "${srcdir}/iptables.initd" "${pkgdir}/etc/init.d/ip6tables" - - sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \ - -e 's|/var/run|/run|g' \ - -e 's|/sbin|/usr/bin|g' \ - -i ${pkgdir}/etc/init.d/ip6tables -} - -package_firewalld-openrc() { - pkgdesc="OpenRC firewalld init script" - depends=('firewalld' 'openrc') - - _inst_initd 'firewalld' - sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/firewalld -} - -package_apparmor-openrc() { - pkgdesc="OpenRC apparmor init script" - depends=('apparmor' 'openrc') - - _inst_initd 'apparmor' - sed 's|libexec|lib/apparmor|' -i ${pkgdir}/etc/init.d/apparmor -} - -package_shorewall-openrc() { - pkgdes="OpenRC shorewall init script" - depends=('shorewall' 'openrc') - backup=('etc/conf.d/shorewall') - - _inst_initd 'shorewall' - _inst_confd 'shorewall' -} - -package_shorewall6-openrc() { - pkgdes="OpenRC shorewall6 init script" - depends=('shorewall6' 'openrc') - backup=('etc/conf.d/shorewall6') - - _inst_initd 'shorewall6' - _inst_confd 'shorewall6' - sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/shorewall6 -} - -package_nftables-openrc() { - pkgdes="OpenRC nftables init script" - depends=('nftables' 'openrc') - backup=('etc/conf.d/nftables') - - _inst_confd 'nftables' - - install -Dm755 "${srcdir}/nftables.shd" "${pkgdir}/usr/lib/nftables/nftables.sh" - _inst_initd 'nftables' - sed -e 's|/sbin|/usr/bin|g' \ - -e 's|libexec|lib|g' \ - -i "${pkgdir}/etc/init.d/nftables" -} From 837e59a0718b8c6a6e7e61e3ccb92697922c8182 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 20 2022 01:17:01 +0000 Subject: [PATCH 29/200] addpkg: nonsystemd/elogind-openrc 20210704-1 Signed-off-by: David P --- diff --git a/nonsystemd/elogind-openrc/PKGBUILD b/nonsystemd/elogind-openrc/PKGBUILD new file mode 100644 index 0000000..38eb7f2 --- /dev/null +++ b/nonsystemd/elogind-openrc/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: David P. +# Maintainer (Artix): artoo + +pkgname=elogind-openrc +pkgver=20210704 +pkgrel=1 +pkgdesc="OpenRC elogind init script" +arch=('any') +url="https://gitea.artixlinux.org/packagesE/elogind-openrc" +license=('GPL2') +provides=('init-logind' 'init-elogind') +conflicts=('init-logind' 'init-elogind') +source=(#"elogind.confd" + "elogind.sv.initd") +sha256sums=('b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b') + +package() { + depends=('elogind' 'dbus-openrc') +# install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind + install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind + + install -d "${pkgdir}"/etc/runlevels/boot + ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind +} diff --git a/nonsystemd/elogind-openrc/elogind.sv.initd b/nonsystemd/elogind-openrc/elogind.sv.initd new file mode 100644 index 0000000..79194b2 --- /dev/null +++ b/nonsystemd/elogind-openrc/elogind.sv.initd @@ -0,0 +1,12 @@ +#!/usr/bin/openrc-run +# Copyright 2021 Artix Linux +# Distributed under the terms of the GNU General Public License v2 + +supervisor=supervise-daemon +command="/usr/lib/elogind/elogind" + +depend() { + need dbus + provide logind + before xdm +} From b9979edbf7c7e4d16e80e71996c8fabc98a62119 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 20 2022 02:43:22 +0000 Subject: [PATCH 30/200] deprecate notsystemd unmaintained Signed-off-by: David P --- diff --git a/nonsystemd/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/nonsystemd/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch deleted file mode 100644 index b0e9232..0000000 --- a/nonsystemd/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch +++ /dev/null @@ -1,243 +0,0 @@ -From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:19:20 -0400 -Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux - -This is not a blind replacement of "Linux" with "GNU/Linux". In some -cases, "Linux" is (correctly) used to refer to just the kernel. In others, -it is in a string for which code must also be adjusted; these instances -are not included in this commit. ---- - man/daemon.xml | 4 ++-- - man/journald.conf.xml | 2 +- - man/machinectl.xml | 2 +- - man/sd-bus-errors.xml | 2 +- - man/sd-login.xml | 2 +- - man/sd_bus_error_add_map.xml | 2 +- - man/sd_uid_get_state.xml | 2 +- - man/systemd-detect-virt.xml | 4 ++-- - man/systemd-machine-id-setup.xml | 2 +- - man/systemd-resolved.service.xml | 6 +++--- - man/systemd.exec.xml | 2 +- - man/systemd.socket.xml | 2 +- - man/systemd.xml | 6 +++--- - 13 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/man/daemon.xml b/man/daemon.xml -index 36c7c09db1..730507ed7e 100644 ---- a/man/daemon.xml -+++ b/man/daemon.xml -@@ -144,7 +144,7 @@ - - New-Style Daemons - -- Modern services for Linux should be implemented as -+ Modern services for GNU/Linux should be implemented as - new-style daemons. This makes it easier to supervise and control - them at runtime and simplifies their implementation. - -@@ -285,7 +285,7 @@ - as detailed in the LSB - Linux Standard Base Core Specification. This method of -- activation is supported ubiquitously on Linux init systems, both -+ activation is supported ubiquitously on GNU/Linux init systems, both - old-style and new-style systems. Among other issues, SysV init - scripts have the disadvantage of involving shell scripts in the - boot process. New-style init systems generally employ updated -diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index ee8e8b7faf..28324ac102 100644 ---- a/man/journald.conf.xml -+++ b/man/journald.conf.xml -@@ -111,7 +111,7 @@ - SplitMode= - - Controls whether to split up journal files per user, either uid or -- none. Split journal files are primarily useful for access control: on UNIX/Linux access -+ none. Split journal files are primarily useful for access control: on GNU/Linux access - control is managed per file, and the journal daemon will assign users read access to their journal files. If - uid, all regular users will each get their own journal files, and system users will log to - the system journal. If none, journal files are not split up by user and all messages are -diff --git a/man/machinectl.xml b/man/machinectl.xml -index affca1dec1..278ca8d677 100644 ---- a/man/machinectl.xml -+++ b/man/machinectl.xml -@@ -867,7 +867,7 @@ - The machinectl tool operates on machines - and images whose names must be chosen following strict - rules. Machine names must be suitable for use as host names -- following a conservative subset of DNS and UNIX/Linux -+ following a conservative subset of DNS and GNU/Linux - semantics. Specifically, they must consist of one or more - non-empty label strings, separated by dots. No leading or trailing - dots are allowed. No sequences of multiple dots are allowed. The -diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml -index c834bde292..fdd2261fe9 100644 ---- a/man/sd-bus-errors.xml -+++ b/man/sd-bus-errors.xml -@@ -102,7 +102,7 @@ - - In addition to this list, in sd-bus, the special error - namespace System.Error. is used to map -- arbitrary Linux system errors (as defined by errno3) - to D-Bus errors and back. For example, the error - EUCLEAN is mapped to -diff --git a/man/sd-login.xml b/man/sd-login.xml -index 83ef0b7307..93fd9ea782 100644 ---- a/man/sd-login.xml -+++ b/man/sd-login.xml -@@ -244,7 +244,7 @@ - - - Multi-Seat on Linux -- for an introduction to multi-seat support on Linux and the background for this set of APIs. -+ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs. - - - -diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml -index 3eacbab660..b4b3b1bd17 100644 ---- a/man/sd_bus_error_add_map.xml -+++ b/man/sd_bus_error_add_map.xml -@@ -58,7 +58,7 @@ - - The sd_bus_error_add_map() call may be - used to register additional mappings for converting D-Bus errors -- to Linux errno-style errors. The mappings -+ to GNU/Linux errno-style errors. The mappings - defined with this call are consulted by calls such as - sd_bus_error_set3 - or -diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml -index 02670e1bce..6f4ff77130 100644 ---- a/man/sd_uid_get_state.xml -+++ b/man/sd_uid_get_state.xml -@@ -174,7 +174,7 @@ - An input parameter was invalid (out of range, - or NULL, where that is not accepted). This is also returned if - the passed user ID is 0xFFFF or 0xFFFFFFFF, which are -- undefined on Linux. -+ undefined on GNU/Linux. - - - -diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml -index c4763fd561..54bba23666 100644 ---- a/man/systemd-detect-virt.xml -+++ b/man/systemd-detect-virt.xml -@@ -133,12 +133,12 @@ - - - lxc -- Linux container implementation by LXC -+ Container implementation by LXC - - - - lxc-libvirt -- Linux container implementation by libvirt -+ Container implementation by libvirt - - - -diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml -index 9e84fd8ccb..7f0dcd14d7 100644 ---- a/man/systemd-machine-id-setup.xml -+++ b/man/systemd-machine-id-setup.xml -@@ -58,7 +58,7 @@ - and is different for every booted instance of the - VM. - -- Similarly, if run inside a Linux container -+ Similarly, if run inside a container - environment and a UUID is configured for the container, this is - used to initialize the machine ID. For details, see the - documentation of the getaddrinfo3 API as defined - by RFC3493 and its related resolver functions, - including gethostbyname3. This -- API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC -+ API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC - validation status information however, and is synchronous only. This API is backed by the glibc Name Service - Switch (nss5). Usage of the - glibc NSS module nss-resolve8 -@@ -153,7 +153,7 @@ - - - systemd-resolved maintains the -- /run/systemd/resolve/stub-resolv.conf file for compatibility with traditional Linux -+ /run/systemd/resolve/stub-resolv.conf file for compatibility with traditional GNU/Linux - programs. This file may be symlinked from /etc/resolv.conf. This file lists the 127.0.0.53 - DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by - systemd-resolved. The list of search domains is always kept up-to-date. Note that -@@ -169,7 +169,7 @@ - systemd-resolved. This file does not contain any search domains. - - systemd-resolved maintains the -- /run/systemd/resolve/resolv.conf file for compatibility with traditional Linux -+ /run/systemd/resolve/resolv.conf file for compatibility with traditional GNU/Linux - programs. This file may be symlinked from /etc/resolv.conf and is always kept up-to-date, - containing information about all known DNS servers. Note the file format's limitations: it does not know a - concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that -diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 3bd790b485..a532b74a6e 100644 ---- a/man/systemd.exec.xml -+++ b/man/systemd.exec.xml -@@ -191,7 +191,7 @@ - which must be one of a-z, A-Z or _ (i.e. numbers and - are not permitted - as first character). The user/group name must have at least one character, and at most 31. These restrictions - are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among -- Linux systems. -+ GNU/Linux systems. - - When used in conjunction with DynamicUser= the user/group name specified is - dynamically allocated at the time the service is started, and released at the time the service is stopped — -diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml -index 19c2ca9907..5fd6c1598f 100644 ---- a/man/systemd.socket.xml -+++ b/man/systemd.socket.xml -@@ -280,7 +280,7 @@ - Specifies a POSIX message queue name to listen - on. This expects a valid message queue name (i.e. beginning - with /). Behavior otherwise is very similar to the -- ListenFIFO= directive above. On Linux -+ ListenFIFO= directive above. On GNU/Linux - message queue descriptors are actually file descriptors and - can be inherited between processes. - -diff --git a/man/systemd.xml b/man/systemd.xml -index 17ab59beb5..89086558c7 100644 ---- a/man/systemd.xml -+++ b/man/systemd.xml -@@ -40,7 +40,7 @@ - - Description - -- systemd is a system and service manager for Linux operating -+ systemd is a system and service manager for GNU/Linux operating - systems. When run as first process on boot (as PID 1), it acts as - init system that brings up and maintains userspace - services. -@@ -888,10 +888,10 @@ - Kernel Command Line - - When run as system instance systemd parses a number of -- kernel command line argumentsIf run inside a Linux -+ kernel command line argumentsIf run inside a - container these arguments may be passed as command line arguments - to systemd itself, next to any of the command line options listed -- in the Options section above. If run outside of Linux containers, -+ in the Options section above. If run outside of a container, - these arguments are parsed from /proc/cmdline - instead.: - --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch b/nonsystemd/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch deleted file mode 100644 index c511144..0000000 --- a/nonsystemd/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001 -Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" -Date: Tue, 6 Mar 2018 23:39:47 +0100 -Subject: [PATCH] Use Arch Linux' device access groups -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - cdrom → optical - dialout → uucp - tape → storage ---- - rules/50-udev-default.rules.in | 14 +++++++------- - sysusers.d/basic.conf.in | 6 +++--- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in -index 191f56f42..f81c4d0fc 100644 ---- a/rules/50-udev-default.rules.in -+++ b/rules/50-udev-default.rules.in -@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" --KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" -+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" - - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - -@@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" - - SUBSYSTEM=="block", GROUP="disk" --SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" --SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" --KERNEL=="sch[0-9]*", GROUP="cdrom" --KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" --KERNEL=="pktcdvd", GROUP="cdrom" -+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical" -+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical" -+KERNEL=="sch[0-9]*", GROUP="optical" -+KERNEL=="pktcdvd[0-9]*", GROUP="optical" -+KERNEL=="pktcdvd", GROUP="optical" - --SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" -+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage" - SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" - KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" - KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" -diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in -index 8e358c02d..33e513a36 100644 ---- a/sysusers.d/basic.conf.in -+++ b/sysusers.d/basic.conf.in -@@ -24,14 +24,14 @@ g utmp - - - - - # Hardware access groups - g audio - - - --g cdrom - - - --g dialout - - - - g disk - - - - g input - - - - g kvm - - - - g lp - - - -+g optical - - - - g render - - - --g tape - - - -+g storage - - - -+g uucp - - - - g video - - - - - # Default group for normal users --- -2.16.2 - diff --git a/nonsystemd/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/nonsystemd/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch deleted file mode 100644 index 1f49c9e..0000000 --- a/nonsystemd/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:23:40 -0400 -Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux" - instead of "Linux" - ---- - man/kernel-install.xml | 2 +- - man/os-release.xml | 2 +- - src/analyze/analyze.c | 2 +- - src/core/main.c | 4 ++-- - src/firstboot/firstboot.c | 2 +- - src/kernel-install/90-loaderentry.install | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/man/kernel-install.xml b/man/kernel-install.xml -index cd9756662a..9ead6ea39b 100644 ---- a/man/kernel-install.xml -+++ b/man/kernel-install.xml -@@ -88,7 +88,7 @@ - PRETTY_NAME parameter specified - in /etc/os-release or - /usr/lib/os-release (if the former is -- missing), or "Linux -+ missing), or "GNU/Linux - KERNEL-VERSION", if unset. If - the file initrd is found next to the - linux file, the initrd will be added to -diff --git a/man/os-release.xml b/man/os-release.xml -index a51edf3b8a..9ff4b7e8c2 100644 ---- a/man/os-release.xml -+++ b/man/os-release.xml -@@ -187,7 +187,7 @@ - suitable for presentation to the user. May or may not contain - a release code name or OS version of some kind, as suitable. - If not set, defaults to -- PRETTY_NAME="Linux". Example: -+ PRETTY_NAME="GNU/Linux". Example: - PRETTY_NAME="Fedora 17 (Beefy - Miracle)". - -diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c -index de0fe6eba8..9f239c8eeb 100644 ---- a/src/analyze/analyze.c -+++ b/src/analyze/analyze.c -@@ -712,7 +712,7 @@ static int analyze_plot(int argc, char *argv[], void *userdata) { - svg("%s", pretty_times); - if (use_full_bus) - svg("%s %s (%s %s %s) %s %s", -- isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name, -+ isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name, - strempty(host->hostname), - strempty(host->kernel_name), - strempty(host->kernel_release), -diff --git a/src/core/main.c b/src/core/main.c -index 44dd8348be..9a4fc26425 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -1234,11 +1234,11 @@ static int status_welcome(void) { - return status_printf(NULL, false, false, - "\nWelcome to \x1B[%sm%s\x1B[0m!\n", - isempty(ansi_color) ? "1" : ansi_color, -- isempty(pretty_name) ? "Linux" : pretty_name); -+ isempty(pretty_name) ? "GNU/Linux" : pretty_name); - else - return status_printf(NULL, false, false, - "\nWelcome to %s!\n", -- isempty(pretty_name) ? "Linux" : pretty_name); -+ isempty(pretty_name) ? "GNU/Linux" : pretty_name); - } - - static int write_container_id(void) { -diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index a98e53b3a3..41b212e32d 100644 ---- a/src/firstboot/firstboot.c -+++ b/src/firstboot/firstboot.c -@@ -87,7 +87,7 @@ static void print_welcome(void) { - "Failed to read os-release file, ignoring: %m"); - - printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", -- isempty(pretty_name) ? "Linux" : pretty_name); -+ isempty(pretty_name) ? "GNU/Linux" : pretty_name); - - press_any_key(); - -diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install -index a271cdb8a0..29047ccbff 100644 ---- a/src/kernel-install/90-loaderentry.install -+++ b/src/kernel-install/90-loaderentry.install -@@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then - fi - - if ! [[ $PRETTY_NAME ]]; then -- PRETTY_NAME="Linux $KERNEL_VERSION" -+ PRETTY_NAME="GNU/Linux $KERNEL_VERSION" - fi - - declare -a BOOT_OPTIONS --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/nonsystemd/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch deleted file mode 100644 index 401d284..0000000 --- a/nonsystemd/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:24:56 -0400 -Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of - "Linux" - ---- - man/os-release.xml | 2 +- - src/journal-remote/journal-gatewayd.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/os-release.xml b/man/os-release.xml -index 9ff4b7e8c2..1c069275c8 100644 ---- a/man/os-release.xml -+++ b/man/os-release.xml -@@ -98,7 +98,7 @@ - A string identifying the operating system, - without a version component, and suitable for presentation to - the user. If not set, defaults to -- NAME=Linux. Example: -+ NAME=GNU/Linux. Example: - NAME=Fedora or NAME="Debian - GNU/Linux". - -diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c -index 9e77e314ff..3d0c3aafd7 100644 ---- a/src/journal-remote/journal-gatewayd.c -+++ b/src/journal-remote/journal-gatewayd.c -@@ -788,7 +788,7 @@ static int request_handler_machine( - SD_ID128_FORMAT_VAL(mid), - SD_ID128_FORMAT_VAL(bid), - hostname_cleanup(hostname), -- os_name ? os_name : "Linux", -+ os_name ? os_name : "GNU/Linux", - v ? v : "bare", - usage, - cutoff_from, --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/nonsystemd/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch deleted file mode 100644 index 58e157b..0000000 --- a/nonsystemd/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:28:30 -0400 -Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of - "linux" - -As far as I can tell, no code in this repository actually uses the ID -field, so this is just a man page change. ---- - man/os-release.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/os-release.xml b/man/os-release.xml -index 1c069275c8..272258b4e1 100644 ---- a/man/os-release.xml -+++ b/man/os-release.xml -@@ -122,7 +122,7 @@ - the operating system, excluding any version information and - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to -- ID=linux. Example: -+ ID=gnu-linux. Example: - ID=fedora or - ID=debian. - --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/nonsystemd/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch deleted file mode 100644 index 5e170ce..0000000 --- a/nonsystemd/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:31:20 -0400 -Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux" - instead of "linux" - ---- - src/resolve/resolved-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index 01372fc66b..9155ce5c2e 100644 ---- a/src/resolve/resolved-manager.c -+++ b/src/resolve/resolved-manager.c -@@ -387,10 +387,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char - static const char *fallback_hostname(void) { - - /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be -- * "localhost" even if that's the compiled in hostname. In this case, let's revert to "linux" instead. */ -+ * "localhost" even if that's the compiled in hostname. In this case, let's revert to "gnu-linux" instead. */ - - if (is_localhost(FALLBACK_HOSTNAME)) -- return "linux"; -+ return "gnu-linux"; - - return FALLBACK_HOSTNAME; - } --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch deleted file mode 100644 index 0905e6b..0000000 --- a/nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Wed, 25 May 2016 12:32:21 -0400 -Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples - ---- - man/os-release.xml | 49 +++++++++++++++++++++-------------------- - man/systemd-nspawn.xml | 50 +++++++++++++++++++++++------------------- - 2 files changed, 52 insertions(+), 47 deletions(-) - -diff --git a/man/os-release.xml b/man/os-release.xml -index 272258b4e1..6cea40cb99 100644 ---- a/man/os-release.xml -+++ b/man/os-release.xml -@@ -99,7 +99,7 @@ - without a version component, and suitable for presentation to - the user. If not set, defaults to - NAME=GNU/Linux. Example: -- NAME=Fedora or NAME="Debian -+ NAME=BLAG or NAME="gNewSense - GNU/Linux". - - -@@ -110,8 +110,8 @@ - version, excluding any OS name information, possibly including - a release code name, and suitable for presentation to the - user. This field is optional. Example: -- VERSION=17 or VERSION="17 (Beefy -- Miracle)". -+ VERSION=210k or VERSION="210k -+ (Spartakus)". - - - -@@ -123,8 +123,8 @@ - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to - ID=gnu-linux. Example: -- ID=fedora or -- ID=debian. -+ ID=blag or -+ ID=gnewsense. - - - -@@ -145,9 +145,9 @@ - should be listed in order of how closely the local operating - system relates to the listed ones, starting with the closest. - This field is optional. Example: for an operating system with -- ID=centos, an assignment of -+ ID=blag, an assignment of - ID_LIKE="rhel fedora" would be appropriate. -- For an operating system with ID=ubuntu, an -+ For an operating system with ID=gnewsense, an - assignment of ID_LIKE=debian is - appropriate. - -@@ -176,8 +176,8 @@ - identifying the operating system version, excluding any OS - name information or release code name, and suitable for - processing by scripts or usage in generated filenames. This -- field is optional. Example: VERSION_ID=17 -- or VERSION_ID=11.04. -+ field is optional. Example: VERSION_ID=210k -+ or VERSION_ID=7.0. - - - -@@ -188,8 +188,8 @@ - a release code name or OS version of some kind, as suitable. - If not set, defaults to - PRETTY_NAME="GNU/Linux". Example: -- PRETTY_NAME="Fedora 17 (Beefy -- Miracle)". -+ PRETTY_NAME="BLAG 210k -+ (Spartakus)". - - - -@@ -212,7 +212,7 @@ - Common - Platform Enumeration Specification as proposed by the - NIST. This field is optional. Example: -- CPE_NAME="cpe:/o:fedoraproject:fedora:17" -+ CPE_NAME="cpe:/o:blagblagblag:blag:210k" - - - -@@ -247,8 +247,8 @@ - one URL shall be listed in each setting. If multiple resources - need to be referenced, it is recommended to provide an online - landing page linking all available resources. Examples: -- HOME_URL="https://fedoraproject.org/" and -- BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ HOME_URL="https://www.blagblagblag.org/" and -+ BUG_REPORT_URL="https://blag.fsf.org/" - - - -@@ -323,21 +323,22 @@ - recommended to prefix new fields with an OS specific - name in order to avoid name clashes. Applications - reading this file must ignore unknown fields. Example: -- DEBIAN_BTS="debbugs://bugs.debian.org/" -+ DEBIAN_BTS="debbugs://bugs.gnewsense.org/" - - - - Example - -- NAME=Fedora --VERSION="17 (Beefy Miracle)" --ID=fedora --VERSION_ID=17 --PRETTY_NAME="Fedora 17 (Beefy Miracle)" --ANSI_COLOR="0;34" --CPE_NAME="cpe:/o:fedoraproject:fedora:17" --HOME_URL="https://fedoraproject.org/" --BUG_REPORT_URL="https://bugzilla.redhat.com/" -+ NAME=Parabola -+VERSION="rolling-release" -+ID=parabola -+ID_LIKE=arch -+VERSION_ID=rolling-release -+PRETTY_NAME="Parabola GNU/Linux-libre" -+ANSI_COLOR="1;35" -+CPE_NAME="cpe:/o:parabola:parabola:rolling-release" -+HOME_URL="https://www.parabola.nu/" -+BUG_REPORT_URL="https://labs.parabola.nu/" - - - -diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 284c9b294b..7b3d211161 100644 ---- a/man/systemd-nspawn.xml -+++ b/man/systemd-nspawn.xml -@@ -1,7 +1,7 @@ - - -+ - - ]> - -@@ -1176,11 +1176,12 @@ - - Examples - -+ - - -- Build and boot a minimal Fedora distribution in a container -+ Build and boot a minimal BLAG distribution in a container - -- # dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \ -- --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ -- systemd passwd dnf fedora-release vim-minimal --# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version; -+ # dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \ -+ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \ -+ systemd passwd dnf blag-release vim-minimal -+# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version; - -- This installs a minimal Fedora distribution into the -- directory /var/lib/machines/f&fedora_latest_version; -+ This installs a minimal BLAG distribution into the -+ directory /var/lib/machines/blag&blag_latest_version; - and then boots an OS in a namespace container in it. Because the installation - is located underneath the standard /var/lib/machines/ - directory, it is also possible to start the machine using -- systemd-nspawn -M f&fedora_latest_version;. -+ systemd-nspawn -M blag&blag_latest_version;. - - - -- Spawn a shell in a container of a minimal Debian unstable distribution -+ Spawn a shell in a container of a minimal gNewSense Ucclia distribution - -- # debootstrap unstable ~/debian-tree/ --# systemd-nspawn -D ~/debian-tree/ -+ # debootstrap ucclia ~/gnewsense-tree/ -+# systemd-nspawn -D ~/gnewsense-tree/ - -- This installs a minimal Debian unstable distribution into -- the directory ~/debian-tree/ and then -+ This installs a minimal gNewSense unstable distribution into -+ the directory ~/gnewsense-tree/ and then - spawns a shell in a namespace container in it. - - debootstrap supports -@@ -1227,29 +1229,31 @@ - - - Boot a minimal -- <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container -+ Parabola GNU/Linux-libre distribution in a container - -- # pacstrap -c -d ~/arch-tree/ base --# systemd-nspawn -bD ~/arch-tree/ -+ # pacstrap -c -d ~/parabola-tree/ base -+# systemd-nspawn -bD ~/parabola-tree/ - -- This installs a minimal Arch Linux distribution into the -- directory ~/arch-tree/ and then boots an OS -+ This installs a minimal Parabola distribution into the -+ directory ~/parabola-tree/ and then boots an OS - in a namespace container in it. - - -+ - - - Boot into an ephemeral snapshot of the host system --- -2.18.0 - diff --git a/nonsystemd/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/nonsystemd/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch deleted file mode 100644 index 0fe5def..0000000 --- a/nonsystemd/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001 -From: Luke Shumaker -Date: Sat, 17 Dec 2016 00:56:43 -0500 -Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of - "Linux Boot Manager" - ---- - src/boot/bootctl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c -index 2832a39dd7..534870ee50 100644 ---- a/src/boot/bootctl.c -+++ b/src/boot/bootctl.c -@@ -665,13 +665,13 @@ static int install_variables(const char *esp_path, - "Failed to determine current boot order: %m"); - - if (first || r == 0) { -- r = efi_add_boot_option(slot, "Linux Boot Manager", -+ r = efi_add_boot_option(slot, "Systemd Boot Manager", - part, pstart, psize, - uuid, path); - if (r < 0) - return log_error_errno(r, "Failed to create EFI Boot variable entry: %m"); - -- log_info("Created EFI boot entry \"Linux Boot Manager\"."); -+ log_info("Created EFI boot entry \"Systemd Boot Manager\"."); - } - - return insert_into_order(slot, first); --- -2.18.0 - diff --git a/nonsystemd/notsystemd/PKGBUILD b/nonsystemd/notsystemd/PKGBUILD deleted file mode 100644 index ec220a8..0000000 --- a/nonsystemd/notsystemd/PKGBUILD +++ /dev/null @@ -1,334 +0,0 @@ -# Maintainer (Arch:systemd): Christian Hesse -# Maintainer (Arch:systemd): Dave Reisner -# Maintainer (Arch:systemd): Tom Gundersen -# Maintainer: Luke Shumaker -# Contributor: Omar Vega Ramos - -# Justification for being in [libre]: Potential dependency of -# libretools. - -_pkgbase=systemd -# Can be from either systemd or systemd-stable -_commit='de7436b02badc82200dc127ff190b8155769b8e7' -_pkgver=239.0 - -pkgbase=notsystemd -# Include only split packages that link against libsystemd-shared-XXX.so -pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-common') -pkgver=239.1 -pkgrel=3 -arch=('x86_64') -arch+=('i686' 'armv7h') -url="https://repo.parabola.nu/other/${pkgname}" -makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' - 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' - 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' - 'python-lxml' 'quota-tools' 'shadow' 'git' - 'meson' 'libseccomp' 'pcre2') -makedepends_i686=('gnu-efi-libs') -makedepends_x86_64=('gnu-efi-libs') -options=('strip') -validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering - '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E' # Zbigniew Jędrzejewski-Szmek - '99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker -source=(# fragment is latest tag for source verification, final merge in prepare() - "git+https://github.com/systemd/systemd-stable#tag=v${_pkgver%.*}?signed" - "git+https://github.com/systemd/systemd#tag=v${_pkgver%.*}?signed" - '0001-Use-Arch-Linux-device-access-groups.patch' - "https://repo.parabola.nu/other/${pkgname}/${pkgbase}-${pkgver}.tar.gz"{,.sig} - 'initcpio-hook-udev' - 'initcpio-install-systemd' - 'initcpio-install-udev' - 'parabola.conf' - 'loader.conf' - 'splash-parabola.bmp' - 'systemd-user.pam' - 'systemd-hook' - 'udev-hook' - 'systemd-binfmt.hook' - 'systemd-catalog.hook' - 'systemd-daemon-reload.hook' - 'systemd-hwdb.hook' - 'systemd-sysctl.hook' - 'systemd-sysusers.hook' - 'systemd-tmpfiles.hook' - 'systemd-udev-reload.hook' - 'systemd-update.hook' - '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' - '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch' - '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch' - '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' - '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' - '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' - '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch') -sha512sums=('SKIP' - 'SKIP' - '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' - 'b51d9ac5b6dd9893f2b6654cf0ae96a5576b1ae0a5e03b9a491d6ca51a4ba6138e0839396c8526ab293091ec1c8e02e3ec0ef80f67c965d94bfaa47b6ac20319' - 'SKIP' - 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' - 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' - '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8' - '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9' - 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c' - 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40' - 'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d' - '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8' - '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb' - '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2' - '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc' - 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a' - '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763' - '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447' - 'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6' - '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67' - 'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568' - 'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38' - 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67' - 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' - '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30' - 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83' - '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') - -_backports=( - '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h -) - -_reverts=( -) - -prepare() { - cd "$_pkgbase-stable" - - # add upstream repository for cherry-picking - git remote add -f upstream ../systemd - # merge the latest stable commit (fast-foward only to make sure - # the verified tag is in) - git merge --ff-only "${_commit}" - - local c - for c in "${_backports[@]}"; do - git cherry-pick -n "$c" - done - for c in "${_reverts[@]}"; do - git revert -n "$c" - done - - # Replace cdrom/dialout/tape groups with optical/uucp/storage - patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch - - # apply FSDG patches - local _patch - for _patch in "$srcdir"/????-FSDG-*.patch; do - patch -Np1 -i "$_patch" - done - - # apply notsystemd patches - for _patch in "$srcdir/$pkgname-$pkgver"/????-*.patch; do - patch -Np1 -i "$_patch" - done -} - -build() { - local timeservers=({0..3}.arch.pool.ntp.org) - - if [ "$CARCH" = "armv7h" ]; then - LDFLAGS+=" -Wl,-fuse-ld=bfd" - CFLAGS+=" -fno-lto" - CXXFLAGS+=" -fno-lto" - fi - - local meson_options=( - -Daudit=false - -Dima=false - -Dlz4=true - - -Ddbuspolicydir=/usr/share/dbus-1/system.d - -Ddefault-dnssec=no - # TODO(dreisner): consider changing this to unified - -Ddefault-hierarchy=hybrid - -Ddefault-kill-user-processes=false - -Dfallback-hostname='parabola' - -Dntp-servers="${timeservers[*]}" - -Drpmmacrosdir=no - -Dsysvinit-path= - -Dsysvrcnd-path= - ) - if [ "$CARCH" != "armv7h" ]; then - meson_options+=(-Dgnuefi=true) - fi - - arch-meson "$_pkgbase-stable" build "${meson_options[@]}" - - ninja -C build - - # Go ahead and split the package now. It's easier this way, because - # we can use mv instead of awkward, error-prone rm/cp pairs. - rm -rf "$srcdir/dest" - - # Put things in the main systemd package by default - DESTDIR="$srcdir/dest/systemd" ninja -C build install - - install -dm755 "$srcdir/dest/common"/usr/lib/systemd - mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so - - install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include} - mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd - mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc - mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/ - mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/ - - install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include} - mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h - mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc - mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/ - mv "$srcdir/dest"/systemd/usr/share/man/man3/*udev* -t "$srcdir/dest"/libudev/usr/share/man/man3/ - - install -dm755 "$srcdir/dest/udev"/{etc,usr/lib} - mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/ - mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/ - while read -d '' -r file; do - install -dm755 "$srcdir/dest/udev/${file%/*}" - mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file" - done < <(find "$srcdir/dest/systemd" \( -name '*udev*' -o -name '*hwdb*' \) -printf '%P\0') - - local nssmodule - for nssmodule in systemd myhostname mymachines resolve; do - install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8} - mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \ - "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \ - "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8 - mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/ - done - - install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 - mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8 - - rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include} -} - -check() { - cd build - meson test -} - -package_notsystemd() { - pkgdesc='system and service manager' - license=('LGPL2.1') - depends=('bash' 'dbus' 'kbd' 'kmod' - 'libsystemd' 'pam' 'libelf' - 'util-linux' 'pcre2') - depends+=("notsystemd-common=$pkgver-$pkgrel" 'udev') - provides=("systemd-tools=$_pkgver") - conflicts=('systemd-tools') - optdepends=('libmicrohttpd: remote journald capabilities' - 'quota-tools: kernel-level quota management' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'polkit: allow administration as unprivileged user') - backup=(etc/pam.d/systemd-user - etc/systemd/coredump.conf - etc/systemd/journald.conf - etc/systemd/journal-remote.conf - etc/systemd/journal-upload.conf - etc/systemd/logind.conf - etc/systemd/system.conf - etc/systemd/timesyncd.conf - etc/systemd/resolved.conf - etc/systemd/user.conf) - install=systemd.install - - pkgdesc+=", modified to work with other init systems" - provides+=("${pkgname#not}=$_pkgver") - conflicts+=("${pkgname#not}") - - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#not}" "$pkgdir" - - # don't write units to /etc by default. some of these will be re-enabled on - # post_install. - rm -rv "$pkgdir"/etc/systemd/system/* - - # we'll create this on installation - rmdir "$pkgdir"/var/log/journal/remote - - # executable (symlinks) shipped with systemd-sysvcompat - rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} - - # files shipped with systemd-resolvconf - rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} - - # avoid a potential conflict with [core]/filesystem - rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf - sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf - - # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat - install -m0644 $_pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d - - # ship default policy to leave services disabled - echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - - # add mkinitcpio hooks - install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd - - # ensure proper permissions for /var/log/journal - # The permissions are stored with named group by tar, so this works with - # users and groups populated by systemd-sysusers. This is only to prevent a - # warning from pacman as permissions are set by systemd-tmpfiles anyway. - install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal - - # match directory owner/group and mode from [extra]/polkit - install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d - - # add example bootctl configuration - install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf - install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp - - # pacman hooks - install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook - install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook - rm -- "$pkgdir"/usr/share/libalpm/hooks/*{udev,hwdb}* - - # overwrite the systemd-user PAM configuration with our own - install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user -} - -package_notsystemd-common() { - pkgdesc='systemd files shared between split packages' - license=('LGPL2.1') - depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap' - 'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so' - 'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4' - 'xz') - - pkgdesc="not${pkgdesc}" - conflicts+=("${pkgname#not}") - - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir" -} - -package_notsystemd-udev() { - pkgdesc='Userspace device file manager' - license=('GPL2') # NB: different than the rest - depends=("notsystemd-common=$pkgver-$pkgrel" 'systemd-libudev' - 'hwids' 'kmod' 'util-linux' 'zlib') - backup=(etc/udev/udev.conf) - - provides+=("${pkgname#notsystemd-}=$_pkgver") - conflicts+=("${pkgname#notsystemd-}") - - provides+=("${pkgname#not}=$_pkgver") - conflicts+=("${pkgname#not}") - - cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir" - - # add mkinitcpio hooks - install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev - install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev - - # pacman hooks - install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook - install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *{udev,hwdb}*.hook -} diff --git a/nonsystemd/notsystemd/initcpio-hook-udev b/nonsystemd/notsystemd/initcpio-hook-udev deleted file mode 100644 index ea9a11f..0000000 --- a/nonsystemd/notsystemd/initcpio-hook-udev +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create --boot - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/nonsystemd/notsystemd/initcpio-install-systemd b/nonsystemd/notsystemd/initcpio-install-systemd deleted file mode 100644 index 8fb4441..0000000 --- a/nonsystemd/notsystemd/initcpio-install-systemd +++ /dev/null @@ -1,202 +0,0 @@ -#!/bin/bash - -strip_quotes() { - local len=${#1} quotes=$'[\'"]' str=${!1} - - if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then - printf -v "$1" %s "${str:1:-1}" - fi -} - -add_udev_rule() { - # Add an udev rules file to the initcpio image. Dependencies on binaries - # will be discovered and added. - # $1: path to rules file (or name of rules file) - - local rules= rule= key= value= binary= - - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") - if [[ -z $rules ]]; then - # complain about not found rules - return 1 - fi - - add_file "$rules" - - while IFS=, read -ra rule; do - # skip empty lines, comments - [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue - - for pair in "${rule[@]}"; do - IFS=' =' read -r key value <<< "$pair" - case $key in - RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - strip_quotes 'value' - # just take the first word as the binary name - binary=${value%% *} - [[ ${binary:0:1} == '$' ]] && continue - if [[ ${binary:0:1} != '/' ]]; then - binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") - fi - add_binary "$binary" - ;; - esac - done - done <"$rules" -} - -add_systemd_unit() { - # Add a systemd unit file to the initcpio image. Hard dependencies on binaries - # and other unit files will be discovered and added. - # $1: path to rules file (or name of rules file) - - local unit= rule= entry= key= value= binary= dep= - - unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") - if [[ -z $unit ]]; then - # complain about not found unit file - return 1 - fi - - add_file "$unit" - - while IFS='=' read -r key values; do - read -ra values <<< "$values" - - case $key in - Requires|OnFailure) - # only add hard dependencies (not Wants) - map add_systemd_unit "${values[@]}" - ;; - Exec*) - # don't add binaries unless they are required - if [[ ${values[0]:0:1} != '-' ]]; then - add_binary "${values[0]}" - fi - ;; - esac - - done <"$unit" - - # preserve reverse soft dependency - for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do - if [[ -L $dep ]]; then - add_symlink "$dep" - fi - done - - # add hard dependencies - if [[ -d $unit.requires ]]; then - for dep in "$unit".requires/*; do - add_systemd_unit ${dep##*/} - done - fi -} - -add_systemd_drop_in() { - local unit=$1 dropin_name=$2 - - mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d" - cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf" -} - -build() { - local rules unit - - # from base - add_binary /bin/mount - add_binary /usr/bin/kmod /usr/bin/modprobe - add_binary /usr/lib/systemd/systemd /init - add_binary /usr/bin/sulogin - - map add_binary \ - /usr/bin/systemd-tmpfiles \ - /usr/lib/systemd/systemd-hibernate-resume \ - /usr/lib/systemd/systemd-shutdown \ - /usr/lib/systemd/systemd-sulogin-shell \ - /usr/lib/systemd/system-generators/systemd-fstab-generator \ - /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ - /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - - # for journalctl in emergency shell - add_binary journalctl - - # udev rules and systemd units - map add_udev_rule "$rules" \ - 50-udev-default.rules \ - 60-persistent-storage.rules \ - 64-btrfs.rules \ - 80-drivers.rules \ - 99-systemd.rules - - map add_systemd_unit \ - initrd-cleanup.service \ - initrd-fs.target \ - initrd-parse-etc.service \ - initrd-root-fs.target \ - initrd-root-device.target \ - initrd-switch-root.service \ - initrd-switch-root.target \ - initrd-udevadm-cleanup-db.service \ - initrd.target \ - kmod-static-nodes.service \ - local-fs.target \ - local-fs-pre.target \ - paths.target \ - reboot.target \ - slices.target \ - sockets.target \ - swap.target \ - systemd-fsck@.service \ - systemd-hibernate-resume@.service \ - systemd-journald.service \ - systemd-journald-audit.socket \ - systemd-journald-dev-log.socket \ - systemd-modules-load.service \ - systemd-tmpfiles-setup-dev.service \ - systemd-udev-trigger.service \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - systemd-udevd.service \ - timers.target \ - rescue.target \ - emergency.target - - add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" - add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - - add_binary "$(readlink -f /usr/lib/libnss_files.so)" - printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ - 'passwd: files' \ - 'group: files' \ - 'shadow: files' - - echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd" - echo "root:x:0:root" >"$BUILDROOT/etc/group" - echo "root::::::::" >"$BUILDROOT/etc/shadow" - - add_systemd_drop_in systemd-udevd.service resolve-names <"$BUILDROOT/etc/modules-load.d/MODULES.conf" - ) -} - -help() { - cat <&2 " Skipped: Current root is not booted." - exit 0 - fi -} - -case $1 in - catalog) /usr/bin/journalctl --update-catalog ;; - update) touch -c /usr ;; - sysusers) /usr/bin/systemd-sysusers ;; - tmpfiles) /usr/bin/systemd-tmpfiles --create ;; - - daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; - binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; - sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; - - *) echo >&2 " Invalid operation '$1'"; exit 1 ;; -esac - -exit 0 diff --git a/nonsystemd/notsystemd/systemd-hwdb.hook b/nonsystemd/notsystemd/systemd-hwdb.hook deleted file mode 100644 index ec5bcfb..0000000 --- a/nonsystemd/notsystemd/systemd-hwdb.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/udev/hwdb.d/* - -[Action] -Description = Updating udev hardware database... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/udev-hook hwdb diff --git a/nonsystemd/notsystemd/systemd-sysctl.hook b/nonsystemd/notsystemd/systemd-sysctl.hook deleted file mode 100644 index aec5ac1..0000000 --- a/nonsystemd/notsystemd/systemd-sysctl.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/sysctl.d/*.conf - -[Action] -Description = Applying kernel sysctl settings... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook sysctl diff --git a/nonsystemd/notsystemd/systemd-sysusers.hook b/nonsystemd/notsystemd/systemd-sysusers.hook deleted file mode 100644 index 9873dd4..0000000 --- a/nonsystemd/notsystemd/systemd-sysusers.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/sysusers.d/*.conf - -[Action] -Description = Creating system user accounts... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook sysusers diff --git a/nonsystemd/notsystemd/systemd-tmpfiles.hook b/nonsystemd/notsystemd/systemd-tmpfiles.hook deleted file mode 100644 index df60d82..0000000 --- a/nonsystemd/notsystemd/systemd-tmpfiles.hook +++ /dev/null @@ -1,10 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = usr/lib/tmpfiles.d/*.conf - -[Action] -Description = Creating temporary files... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles diff --git a/nonsystemd/notsystemd/systemd-udev-reload.hook b/nonsystemd/notsystemd/systemd-udev-reload.hook deleted file mode 100644 index 418515d..0000000 --- a/nonsystemd/notsystemd/systemd-udev-reload.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/udev/rules.d/* - -[Action] -Description = Reloading device manager configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/udev-hook udev-reload diff --git a/nonsystemd/notsystemd/systemd-update.hook b/nonsystemd/notsystemd/systemd-update.hook deleted file mode 100644 index 7084a0c..0000000 --- a/nonsystemd/notsystemd/systemd-update.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/ - -[Action] -Description = Arming ConditionNeedsUpdate... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook update diff --git a/nonsystemd/notsystemd/systemd-user.pam b/nonsystemd/notsystemd/systemd-user.pam deleted file mode 100644 index 83f7626..0000000 --- a/nonsystemd/notsystemd/systemd-user.pam +++ /dev/null @@ -1,5 +0,0 @@ -# Used by systemd --user instances. - -account include system-login -session required pam_loginuid.so -session include system-login diff --git a/nonsystemd/notsystemd/systemd.install b/nonsystemd/notsystemd/systemd.install deleted file mode 100644 index fedc747..0000000 --- a/nonsystemd/notsystemd/systemd.install +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash - -sd_booted() { - [[ -d run/systemd/system && ! -L run/systemd/system ]] -} - -add_journal_acls() { - # ignore errors, since the filesystem might not support ACLs - setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null - : -} - -post_common() { - systemd-sysusers - journalctl --update-catalog -} - -_216_2_changes() { - echo ':: Coredumps are handled by systemd by default. Collection behavior can be' - echo ' tuned in /etc/systemd/coredump.conf.' -} - -_219_2_changes() { - if mkdir -m2755 var/log/journal/remote 2>/dev/null; then - chgrp systemd-journal-remote var/log/journal/remote - fi -} - -_219_4_changes() { - if ! systemctl is-enabled -q remote-fs.target; then - systemctl enable -q remote-fs.target - fi -} - -_230_1_changes() { - echo ':: systemd-bootchart is no longer included with systemd' -} - -_232_8_changes() { - # paper over possible effects of CVE-2016-10156 - local stamps=(/var/lib/systemd/timers/*.timer) - - if [[ -f ${stamps[0]} ]]; then - chmod 0644 "${stamps[@]}" - fi -} - -_233_75_3_changes() { - # upstream installs services to /etc, which we remove - # to keep bus activation we re-enable systemd-resolved - if systemctl is-enabled -q systemd-resolved.service; then - systemctl reenable systemd-resolved.service 2>/dev/null - fi -} - -post_install() { - systemd-machine-id-setup - - post_common "$@" - - add_journal_acls - - # enable some services by default, but don't track them - systemctl enable getty@tty1.service remote-fs.target - - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" - - # group 'systemd-journal-remote' is created by systemd-sysusers - mkdir -m2755 var/log/journal/remote - chgrp systemd-journal-remote var/log/journal/remote -} - -post_upgrade() { - post_common "$@" - - # don't reexec if the old version is 231-1 or 231-2. - # https://github.com/systemd/systemd/commit/bd64d82c1c - if [[ $1 != 231-[12] ]] && sd_booted; then - systemctl --system daemon-reexec - fi - - local v upgrades=( - 216-2 - 219-2 - 219-4 - 230-1 - 232-8 - 233.75-3 - ) - - for v in "${upgrades[@]}"; do - if [[ $(vercmp "$v" "$2") -eq 1 ]]; then - "_${v//[.-]/_}_changes" - fi - done -} - -# vim:set ts=2 sw=2 et: diff --git a/nonsystemd/notsystemd/udev-hook b/nonsystemd/notsystemd/udev-hook deleted file mode 100644 index 61d8532..0000000 --- a/nonsystemd/notsystemd/udev-hook +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -udevd_live() { - if [ ! -d /run/udev ]; then - echo >&2 " Skipped: Device manager is not running." - exit 0 - fi -} - -case $1 in - hwdb) /usr/bin/systemd-hwdb --usr update ;; - - udev-reload) udevd_live; /usr/bin/udevadm control --reload ;; - - *) echo >&2 " Invalid operation '$1'"; exit 1 ;; -esac - -exit 0 From 3926152567e39ff939e5f82bbd7ad7596aa8cb50 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 20 2022 03:21:17 +0000 Subject: [PATCH 31/200] updpkg: nonsystemd/elogind 246.10-7 Signed-off-by: David P --- diff --git a/nonsystemd/elogind/PKGBUILD b/nonsystemd/elogind/PKGBUILD index cf3e8cf..1669f9d 100644 --- a/nonsystemd/elogind/PKGBUILD +++ b/nonsystemd/elogind/PKGBUILD @@ -1,20 +1,10 @@ -# Maintainer: Omar Vega Ramos # Maintainer: David P. -# Contributor: Luke Shumaker # Maintainer (Artix): artoo -# This package comes from Artix -# Parabola changes: -# - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous -# - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it, -# so in that way it will provide the correct version according to the -# architecture (libsystemd.so=0-64 or libsystemd.so=0-32) -# - remove prepare() - pkgbase=elogind pkgname=('elogind' 'libelogind') pkgver=246.10 -pkgrel=2 +pkgrel=7 pkgdesc="The systemd project's logind, extracted to a standalone package" arch=('x86_64') arch+=('i686' 'armv7h') @@ -24,10 +14,17 @@ makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus' 'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap') options=('!libtool') source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz" - #'elogind.confd' 'elogind.initd' - 'elogind.sv.initd') + dbus-exit.patch::https://github.com/pierre-labastie/elogind/commit/04d76bc0f087640bedc6ee52525529ccfdc6ae78.patch + fix-p-opt.patch::https://github.com/njhanley/elogind/commit/850797eaf482d7f1ada051730eeeca53676ca43e.patch) sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922' - 'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b') + 'cccbbe6bf6603d81c307ad670994fe058ff630b37c218041c4ca877ef0486843' + '5d39f9d9edd6fb0e9e93bae004ca47bb0973c7570c8dd840f98cda3348bddd7f') + +prepare() { + cd ${pkgbase}-${pkgver} + patch -Np 1 -i ../dbus-exit.patch + patch -Np 1 -i ../fix-p-opt.patch +} build() { local meson_options=( @@ -43,7 +40,7 @@ build() { arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}" - ninja -C build + meson compile -C build } check(){ @@ -52,14 +49,14 @@ check(){ package_elogind() { pkgdesc="The systemd project's logind, extracted to a standalone package" - provides=("systemd=${pkgver}" 'logind') + provides=('logind') depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev') optdepends=('polkit: polkit support') backup=('etc/elogind/logind.conf') - provides+=("${pkgname}-openrc") - conflicts=('systemd-udev' "${pkgname}-openrc") - replaces=("${pkgname}-openrc") + # systemd compatibility + provides+=("systemd=$pkgver") + conflicts+=('systemd') DESTDIR="$pkgdir" meson install -C build @@ -69,29 +66,26 @@ package_elogind() { mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d - - # Init script - #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind - #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind - install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind - - install -d "${pkgdir}"/etc/runlevels/boot - ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind } package_libelogind(){ pkgdesc="elogind client libraries" provides=('libelogind.so' 'liblogind') - provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}" - 'libsystemd.so') - conflicts=('libsystemd.so') depends=('libcap' 'libudev') + # libsystemd compatibility + provides+=('libsystemd.so' "libsystemd=${pkgver}" "systemd-libs=${pkgver}") + conflicts+=('libsystemd.so' 'libsystemd' 'systemd-libs') + cd "${pkgbase}-${pkgver}" install -dm755 "${pkgdir}"/usr/lib mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib - install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so + #ln -sfv libelogind.so "${pkgdir}"/usr/lib/libsystemd.so ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0 + + # libsystemd compatibility + # HACK: (re)install libelogind.so as libsystemd.so so their lib versions match + install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so } diff --git a/nonsystemd/elogind/elogind.sv.initd b/nonsystemd/elogind/elogind.sv.initd deleted file mode 100644 index 79194b2..0000000 --- a/nonsystemd/elogind/elogind.sv.initd +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 2021 Artix Linux -# Distributed under the terms of the GNU General Public License v2 - -supervisor=supervise-daemon -command="/usr/lib/elogind/elogind" - -depend() { - need dbus - provide logind - before xdm -} From a53021f9ea8ec48b0fea4fe9b66b0ef94a69b054 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 20 2022 03:38:12 +0000 Subject: [PATCH 32/200] updpkg: nonsystemd/your-initfreedom 20220719-1 Signed-off-by: David P --- diff --git a/nonsystemd/your-initfreedom/PKGBUILD b/nonsystemd/your-initfreedom/PKGBUILD index 65a73f1..2c8c777 100644 --- a/nonsystemd/your-initfreedom/PKGBUILD +++ b/nonsystemd/your-initfreedom/PKGBUILD @@ -4,16 +4,16 @@ pkgname=your-initfreedom pkgdesc="This package conflicts with every package known to work only for/with systemd." license=('GPL3') url="https://git.parabola.nu/blacklist.git" -pkgver=20210628 -_gitver=50cf92a24fa5e2a6e4d70b90fbabd161dc2554e3 +pkgver=20220719 +_gitver=daf9eebc77cc719c818165e256efd5e0d5dee7aa pkgrel=1 arch=('any') -install=${pkgname}.install +install="${pkgname}.install" makedepends=(librelib) -source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}) -sha512sums=('b0a421a21eedde392d77d1b2264e7d71f4725e89481bca7a01afb25e95a51edeb10a4e7f5fadd31bd243cfdfcdb40d32215f497c994d938c5907223ef8ce9e28') +source=("blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}") +sha512sums=('0060ebc516b1aee1149186e53a1c665d6790da2db7e43ade136731c8b5bd7ab24c4ce9431af8c5a06f3ad569ab73bcd2e5ff0179ac3c8f332ae78fdc266addeb') package() { cd "$srcdir" From 42413e9d52a82e3a6d0af98c5ed1685a2e184b27 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 27 2022 15:40:20 +0000 Subject: [PATCH 33/200] updpkg: libre/linux-libre 5.18.14-1 Signed-off-by: David P --- diff --git a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index a1c62dc..ba0d753 100644 --- a/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 9baf57b4c2d9348bd5adecbb893870d1d79fade1 Mon Sep 17 00:00:00 2001 +From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index b19e2eeaae80..2c2e01d76076 100644 +index fa63cc019ebf..5aa29feccae3 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1240,6 +1240,22 @@ config USER_NS +@@ -1249,6 +1249,22 @@ config USER_NS If unsure, say N. @@ -102,7 +102,7 @@ index 0d8abfb9e0f4..bd7c215e315f 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 830aaf8ca08e..af4c0806bd8e 100644 +index c42ba2d669dc..a6ddbf02a809 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -91,6 +91,9 @@ @@ -115,7 +115,7 @@ index 830aaf8ca08e..af4c0806bd8e 100644 #if defined(CONFIG_SYSCTL) -@@ -1803,6 +1806,15 @@ static struct ctl_table kern_table[] = { +@@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, @@ -150,5 +150,5 @@ index 5481ba44a8d6..423ab2563ad7 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.36.1 +2.37.1 diff --git a/libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch b/libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch index 4d36e40..7212fe4 100644 --- a/libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch +++ b/libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch @@ -1,7 +1,7 @@ -From e410435c977a01e386fda83b5215540365a0086f Mon Sep 17 00:00:00 2001 +From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001 From: Bryan Cain Date: Thu, 5 May 2022 13:12:21 -0600 -Subject: [PATCH 2/2] HID: apple: Properly handle function keys on Keychron +Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron keyboards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -103,5 +103,5 @@ index 0cf35caee9fa..42a568902f49 100644 } -- -2.36.1 +2.37.1 diff --git a/libre/linux-libre/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch b/libre/linux-libre/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch new file mode 100644 index 0000000..606afbd --- /dev/null +++ b/libre/linux-libre/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch @@ -0,0 +1,26 @@ +From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 23 Jul 2022 11:14:46 +0200 +Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms + +See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300 +--- + drivers/soundwire/bus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h +index 7631ef5e71fb..d3ed828daac0 100644 +--- a/drivers/soundwire/bus.h ++++ b/drivers/soundwire/bus.h +@@ -5,7 +5,7 @@ + #define __SDW_BUS_H + + #define DEFAULT_BANK_SWITCH_TIMEOUT 3000 +-#define DEFAULT_PROBE_TIMEOUT 2000 ++#define DEFAULT_PROBE_TIMEOUT 10000 + + u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr); + +-- +2.37.1 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 06574ad..4293987 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre -pkgver=5.18.5 +pkgver=5.18.14 pkgrel=1 pkgdesc='Linux-libre' -rcnver=5.18.2 -rcnrel=armv7-x6 +rcnver=5.18.12 +rcnrel=armv7-x8 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) license=(GPL2) @@ -47,6 +47,7 @@ source=( # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch + 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) @@ -72,7 +73,7 @@ validpgpkeys=( ) sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' 'SKIP' - '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06' + '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -80,8 +81,8 @@ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbeb 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - 'bcec71d3bd1daaa27bdf4c9a10f0b302b915e8236ef47b5e6d6eaf65bfd0b34644d8d3ff6c25d894ae21dedbece3c1f1ff152fbf8525b77100bc790d0541f3f1' - 'e141c387e8045030278d683a1294bfd3d13197bf3466a9c89c4f72a53aafed606acc8e42e528479527c638af895bce2303944b5d8b8a29040f5aae8a9581dd5a' + '9833a9caf788aa928b7c4fab85205259459cc65ccf2b1ef1af8f9dfecf8804829aa4c1f0571a1a0819c6e838ab3f32a5322df9ddb07a201bc43c66ad6c3b2f3b' + '9112373138102b14ca900156afc6292334fc2b9ee542f1f5264ff2b6dc82073f761e9caf35aff56fb47cb285fbc2c4421f6d89c1d417f823f38b1e3f287d9294' '47d16ffc94510d4a8773146a46cfb35aca8cfdae38d17283334cd62d92de36250fbec90e9892357033398ecc7d970127b1a41b703a8372972422ca4af7c90c70' '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' 'f10af02f0cb2d31259d9633e1ba845f555f525789f750fc2ddc51bd18c5ff64fcdd242dae801623887f5ce5cdb5528bce890459f0fab9fd31a28868bb7f6bba5' @@ -89,10 +90,11 @@ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbeb '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '1b6c3108d5628ca6db20c2bc3431e560ab2a274aaf863e7a796f1931a35982d175247f47cbfbb7d643ffc6b742442806755bb10339e5b0577c3f232b38288891' - 'bf6d9a66be49c2cc67b0a0f3cfb61734adf7a3b032b5ed133e1e0afbf4a6ddbd3e8231e4b85fef2e3aeb7274a60f7572a4469c057ff13d81134613f01767d3b2') + '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406' + '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753' + '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce') sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85') -sha512sums_armv7h=('5a75b12dd386940a0bf1be630d45a514ef3c32289ec5976988764baa8483b254e5dcc879337556bfa041b6dbf9ac16debbe4b57bf86db30089661e9536ffaa0a' +sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9' 'SKIP' '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3' '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78' @@ -175,8 +177,7 @@ prepare() { build() { cd $_srcname - make all - make htmldocs + make htmldocs all } _package() { @@ -236,7 +237,7 @@ _package-headers() { localversion.* version vmlinux install -Dt "$builddir/kernel" -m644 kernel/Makefile install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile - if [[ $CARCH = i686 ]]; then + if [ "$CARCH" = i686 ]; then install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu fi cp -t "$builddir" -a scripts @@ -379,7 +380,7 @@ _package-chromebook() { } pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs") -[[ $CARCH = armv7h ]] && pkgname+=("$pkgbase-chromebook") +[ "$CARCH" = armv7h ] && pkgname+=("$pkgbase-chromebook") for _p in "${pkgname[@]}"; do eval "package_$_p() { $(declare -f "_package${_p#$pkgbase}") diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 8258104..a23c25e 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.5-gnu Kernel Configuration +# Linux/x86 5.18.14-gnu Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -18,7 +18,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=0 +CONFIG_PAHOLE_VERSION=123 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -187,6 +187,8 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y @@ -332,8 +334,6 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_BIGSMP=y # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -493,6 +493,14 @@ CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -10478,14 +10486,24 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set CONFIG_SECURITY_LANDLOCK=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_PLATFORM_KEYRING=y +CONFIG_INTEGRITY_MACHINE_KEYRING=y +CONFIG_LOAD_UEFI_KEYS=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="landlock,lockdown,yama,bpf" +CONFIG_LSM="landlock,lockdown,yama,integrity,bpf" # # Kernel hardening options @@ -10496,9 +10514,9 @@ CONFIG_LSM="landlock,lockdown,yama,bpf" # CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set +CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_STACK_ALL_ZERO is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -10769,6 +10787,7 @@ CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y @@ -10861,6 +10880,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y +CONFIG_SIGNATURE=y CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y @@ -10928,6 +10948,9 @@ CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO_BTF=y +CONFIG_PAHOLE_HAS_SPLIT_BTF=y +CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 77f7e30..c9190a5 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.5-gnu Kernel Configuration +# Linux/x86 5.18.14-gnu Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -197,6 +197,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -351,9 +353,6 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y -CONFIG_SLS=y CONFIG_X86_CPU_RESCTRL=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y @@ -497,7 +496,9 @@ CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_ARCH_HAS_KEXEC_PURGATORY=y -# CONFIG_KEXEC_SIG is not set +CONFIG_KEXEC_SIG=y +# CONFIG_KEXEC_SIG_FORCE is not set +CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 @@ -522,6 +523,16 @@ CONFIG_HAVE_LIVEPATCH=y # CONFIG_LIVEPATCH is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_PAGE_TABLE_ISOLATION=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y +CONFIG_SLS=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -10159,7 +10170,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y @@ -10219,7 +10229,7 @@ CONFIG_INTEGRITY_AUDIT=y # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="landlock,lockdown,yama,bpf" +CONFIG_LSM="landlock,lockdown,yama,integrity,bpf" # # Kernel hardening options @@ -10533,6 +10543,7 @@ CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y From 3bbbb1579e8f4c6afd04294f5b68e9ef71577e85 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Jul 27 2022 21:42:08 +0000 Subject: [PATCH 34/200] pcr: gajim-plugin-omemo: update to 2.8.15 Acked-by: Denis 'GNUtoo' Carikli GNUtoo: commit message, minor fixes (pkgrel set to 1, s/rm -rf/rm -f/) Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/gajim-plugin-omemo/PKGBUILD b/pcr/gajim-plugin-omemo/PKGBUILD index a255018..aff3a35 100644 --- a/pcr/gajim-plugin-omemo/PKGBUILD +++ b/pcr/gajim-plugin-omemo/PKGBUILD @@ -3,34 +3,33 @@ # Maintainer: David P. # Contributor: Denis 'GNUtoo' Carikli +# Contributor: Wael Karram # parabola changes and rationale: # no changes. pkgname=gajim-plugin-omemo _pkgname=omemo -pkgver=2.7.13 +pkgver=2.8.15 pkgrel=1 -_pythonversion=3.9 +_pythonversion=3.10 pkgdesc='Gajim plugin for OMEMO Multi-End Message and Object Encryption.' arch=(any) url='https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin' license=('GPL') -depends=('gajim>=1.2.91' 'gajim<=1.3.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl') +depends=('gajim>=1.4' 'gajim<=1.4.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl') provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') -source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip") -sha512sums=('33f7d1132ed9e218e17c8288ad2586b1a9c6d547db93b5b9bb97abcb8df2541bba35d9cc3fcef74d13b35353636cb4ef652805d69eda878d361b029e62fd9ee2') +source=("https://ftp.gajim.org/plugins/master/${_pkgname}/${_pkgname}_${pkgver}.zip") +sha512sums=('5c3322239a149512f96b35359f0f423070f2e16f660885f62485306aaf6baeade564c8e5ab2fcfb63c1554dca8624c5d6fda5c0435c83aaafb484c98092fce48') package() { - cd "${srcdir}/${_pkgname}" + cd "${srcdir}" # Remove unnecessary files - rm -r CHANGELOG COPYING + rm -f CHANGELOG COPYING # Install the plugin install -d "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}" cp -r * "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}/" } - -# vim:set ts=2 sw=2 et: From 9044b433864d3049d11eeb057c0f26770440de23 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Jul 27 2022 21:42:09 +0000 Subject: [PATCH 35/200] libre: epiphany: update to 42.3 Acked-by: Denis 'GNUtoo' Carikli GNUtoo: commit message Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 5c4b424..9651108 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -14,7 +14,7 @@ # - pin to sodeps pkgname=epiphany -pkgver=41.3 +pkgver=42.3 pkgrel=1 pkgrel+=.parabola1 pkgdesc="A GNOME web browser based on the WebKit rendering engine" @@ -23,24 +23,21 @@ url="https://wiki.gnome.org/Apps/Web" arch=(x86_64) arch+=(i686 armv7h) license=(GPL) -depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive) +depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive libportal-gtk3) depends=( $( sed 's| icu | |' <<<${depends[@]} ) ) depends+=(libhogweed.so) makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools git meson) -makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x - # "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments." - # possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6 checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko) groups=(gnome) -_commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367 # tags/41.3^0 +_commit=6cdf86702e747867b2f4b338429733f84f554f80 # tags/42.3^0 source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit") source+=(libre.patch) sha256sums=('SKIP') -sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689') +sha256sums+=('bf1dd1692ec9f94f8fc669a5ee71dd811d6083465dbb197e3fcc64e2aaf2f709') # check() requires networking -_run_check=1 +_run_check=0 pkgver() { @@ -56,7 +53,7 @@ prepare() { } build() { - arch-meson $pkgname build -D soup2=disabled -D libportal=disabled + arch-meson $pkgname build -D soup2=disabled meson compile -C build } diff --git a/libre/epiphany/libre.patch b/libre/epiphany/libre.patch index c7b9128..4c65f52 100644 --- a/libre/epiphany/libre.patch +++ b/libre/epiphany/libre.patch @@ -1,24 +1,41 @@ ---- epiphany.orig/data/org.gnome.epiphany.gschema.xml 2019-04-27 00:17:50.060428000 -0500 -+++ epiphany/data/org.gnome.epiphany.gschema.xml 2019-04-27 00:17:50.360428000 -0500 -@@ -26,9 +26,7 @@ +From f5240f67aa9f00277570b3b28b726311c32d7843 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Iv=C3=A1n=20=C3=81valos?= +Date: Sun, 24 Jul 2022 02:07:05 -0500 +Subject: [PATCH] libre + +--- + data/org.gnome.epiphany.gschema.xml | 4 +--- + lib/ephy-search-engine-manager.h | 2 +- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml +index 7fcac67b3..6f1444167 100644 +--- a/data/org.gnome.epiphany.gschema.xml ++++ b/data/org.gnome.epiphany.gschema.xml +@@ -53,9 +53,7 @@ - -- [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), -- ('Google', 'https://www.google.com/search?q=%s', '!g'), -- ('Bing', 'https://www.bing.com/search?q=%s', '!b')] -+ [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&t=epiphany', '!ddg')] - - Default search engines. - List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut). ---- epiphany.orig/lib/ephy-search-engine-manager.c 2019-04-27 00:17:49.860428000 -0500 -+++ epiphany/lib/ephy-search-engine-manager.c 2019-04-27 00:55:14.840404975 -0500 -@@ -27,7 +27,7 @@ - #include "ephy-settings.h" - #include "ephy-prefs.h" + , 'url': <'https://duckduckgo.com/?q=%s&t=epiphany'>, 'bang': <'!ddg'>}, +- {'name': <'Google'>, 'url': <'https://www.google.com/search?q=%s'>, 'bang': <'!g'>}, +- {'name': <'Bing'>, 'url': <'https://www.bing.com/search?q=%s'>, 'bang': <'!b'>} ++ {'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/html/?q=%s&t=epiphany'>, 'bang': <'!ddg'>} + ] + ]]> + List of the search engines. +diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h +index c1939d31f..d29bb78c2 100644 +--- a/lib/ephy-search-engine-manager.h ++++ b/lib/ephy-search-engine-manager.h +@@ -32,7 +32,7 @@ G_BEGIN_DECLS + * the version used in your country. For example for the french version : + * replace the ".com" with ".fr" : "https://duckduckgo.fr/?q=%s&t=epiphany" + */ +-#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&t=epiphany") ++#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&t=epiphany") --#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany" -+#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany" + #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ()) - enum { - SEARCH_ENGINES_CHANGED, +-- +2.37.1 + From 6854b4415e44fdaa45c6267de2afaab04fb8cf02 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Jul 27 2022 21:42:09 +0000 Subject: [PATCH 36/200] pcr: libreboot-utils: Add intelmetool Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index 9c9865f..544b590 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,7 +4,7 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=14 +pkgrel=15 _upstream_ver=20211122 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" @@ -39,6 +39,8 @@ prepare() { sed 's#/sbin#/bin#' -i Makefile cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/ectool/" sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/intelmetool/" + sed 's#/sbin#/bin#' -i Makefile cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/inteltool/" sed 's#/sbin#/bin#' -i Makefile cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/nvramtool/" @@ -69,6 +71,9 @@ build() { # Build ECtool. make -C ectool + # Build intelmetool. + make -C intelmetool + # Build inteltool. make -C inteltool @@ -117,6 +122,9 @@ package() { # Install ECtool. make -C ectool install PREFIX="${pkgdir}"/usr + # Install intelmetool. + make -C intelmetool install DESTDIR="${pkgdir}" PREFIX=/usr + # Install inteltool. make -C inteltool install DESTDIR="${pkgdir}" PREFIX=/usr From 2667935f8b09456879f7b48a457a7d11893d192f Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Jul 27 2022 23:42:39 +0000 Subject: [PATCH 37/200] libre: epiphany: unbreak armv7h and i686 builds Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 9651108..77dfcb5 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -15,7 +15,7 @@ pkgname=epiphany pkgver=42.3 -pkgrel=1 +pkgrel=2 pkgrel+=.parabola1 pkgdesc="A GNOME web browser based on the WebKit rendering engine" pkgdesc+=", with DuckDuckGo-HTML search" @@ -23,7 +23,9 @@ url="https://wiki.gnome.org/Apps/Web" arch=(x86_64) arch+=(i686 armv7h) license=(GPL) -depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive libportal-gtk3) +depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive) +# we don't have libportal-gtk3 yet on armv7h and i686 +depends_x86_64+=(libportal-gtk3) depends=( $( sed 's| icu | |' <<<${depends[@]} ) ) depends+=(libhogweed.so) makedepends=(docbook-xml startup-notification lsb-release gobject-introspection @@ -53,7 +55,11 @@ prepare() { } build() { - arch-meson $pkgname build -D soup2=disabled + if [ "${CARCH}" = "x86_64" ] ; then + arch-meson $pkgname build -D soup2=disabled + else + arch-meson $pkgname build -D soup2=disabled -D libportal=disabled + fi meson compile -C build } From a37100424454c91e565569a0e821513ba851bd96 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Jul 27 2022 23:48:30 +0000 Subject: [PATCH 38/200] libre: epiphany: armv7h: build with libportal-gtk3 I was doing too much things at the same time so I forgot to check if armv7h had libportal-gtk3, and it does have it. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 77dfcb5..78b03a7 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -15,7 +15,7 @@ pkgname=epiphany pkgver=42.3 -pkgrel=2 +pkgrel=3 pkgrel+=.parabola1 pkgdesc="A GNOME web browser based on the WebKit rendering engine" pkgdesc+=", with DuckDuckGo-HTML search" @@ -24,7 +24,8 @@ arch=(x86_64) arch+=(i686 armv7h) license=(GPL) depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive) -# we don't have libportal-gtk3 yet on armv7h and i686 +# we don't have libportal-gtk3 yet on i686 +depends_armv7h+=(libportal-gtk3) depends_x86_64+=(libportal-gtk3) depends=( $( sed 's| icu | |' <<<${depends[@]} ) ) depends+=(libhogweed.so) @@ -55,7 +56,7 @@ prepare() { } build() { - if [ "${CARCH}" = "x86_64" ] ; then + if [ "${CARCH}" != "i686" ] ; then arch-meson $pkgname build -D soup2=disabled else arch-meson $pkgname build -D soup2=disabled -D libportal=disabled From 70d8619621681befae944ab2778c42d61058dff4 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 28 2022 02:50:17 +0000 Subject: [PATCH 39/200] updpkg: libre/linux-libre-pae 5.18.14-1 Signed-off-by: David P --- diff --git a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 0de5444..ba0d753 100644 --- a/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 4f6107494a5c5840961a246d8de3c7441d75c6b1 Mon Sep 17 00:00:00 2001 +From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -36,10 +36,10 @@ index 33a4240e6a6f..82213f9c4c17 100644 { return &init_user_ns; diff --git a/init/Kconfig b/init/Kconfig -index e9119bf54b1f..a1a5a68aea07 100644 +index fa63cc019ebf..5aa29feccae3 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1231,6 +1231,22 @@ config USER_NS +@@ -1249,6 +1249,22 @@ config USER_NS If unsure, say N. @@ -63,12 +63,12 @@ index e9119bf54b1f..a1a5a68aea07 100644 bool "PID Namespaces" default y diff --git a/kernel/fork.c b/kernel/fork.c -index f1e89007f228..49144b49a3d1 100644 +index 0d8abfb9e0f4..bd7c215e315f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c -@@ -98,6 +98,10 @@ - #include +@@ -99,6 +99,10 @@ #include + #include +#ifdef CONFIG_USER_NS +#include @@ -77,7 +77,7 @@ index f1e89007f228..49144b49a3d1 100644 #include #include #include -@@ -1922,6 +1926,10 @@ static __latent_entropy struct task_struct *copy_process( +@@ -1992,6 +1996,10 @@ static __latent_entropy struct task_struct *copy_process( if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) return ERR_PTR(-EINVAL); @@ -88,7 +88,7 @@ index f1e89007f228..49144b49a3d1 100644 /* * Thread groups must share signals as well, and detached threads * can only be started up within the thread group. -@@ -3036,6 +3044,12 @@ int ksys_unshare(unsigned long unshare_flags) +@@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags) if (unshare_flags & CLONE_NEWNS) unshare_flags |= CLONE_FS; @@ -102,7 +102,7 @@ index f1e89007f228..49144b49a3d1 100644 if (err) goto bad_unshare_out; diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index 730ab56d9e92..6cf4e5c36ec9 100644 +index c42ba2d669dc..a6ddbf02a809 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -91,6 +91,9 @@ @@ -115,7 +115,7 @@ index 730ab56d9e92..6cf4e5c36ec9 100644 #if defined(CONFIG_SYSCTL) -@@ -1814,6 +1817,15 @@ static struct ctl_table kern_table[] = { +@@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, @@ -150,5 +150,5 @@ index 5481ba44a8d6..423ab2563ad7 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.36.1 +2.37.1 diff --git a/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch b/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch new file mode 100644 index 0000000..7212fe4 --- /dev/null +++ b/libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch @@ -0,0 +1,107 @@ +From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001 +From: Bryan Cain +Date: Thu, 5 May 2022 13:12:21 -0600 +Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron + keyboards +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Keychron's C-series and K-series of keyboards copy the vendor and +product IDs of an Apple keyboard, but only behave like that device when +set to "Mac" mode. In "Windows" mode, the Fn key doesn't generate a +scancode, so it's impossible to use the F1-F12 keys when fnmode is set +to its default value of 1. + +To fix this, make fnmode default to the new value of 3, which behaves +like fnmode=2 for Keychron keyboards and like fnmode=1 for actual Apple +keyboards. This way, Keychron devices are fully usable in both "Windows" +and "Mac" modes, while behavior is unchanged for everything else. + +Signed-off-by: Bryan Cain +Reviewed-by: Hans de Goede +Tested-by: José Expósito +Signed-off-by: Jiri Kosina +--- + drivers/hid/hid-apple.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c +index 0cf35caee9fa..42a568902f49 100644 +--- a/drivers/hid/hid-apple.c ++++ b/drivers/hid/hid-apple.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "hid-ids.h" + +@@ -35,16 +36,17 @@ + #define APPLE_NUMLOCK_EMULATION BIT(8) + #define APPLE_RDESC_BATTERY BIT(9) + #define APPLE_BACKLIGHT_CTL BIT(10) ++#define APPLE_IS_KEYCHRON BIT(11) + + #define APPLE_FLAG_FKEY 0x01 + + #define HID_COUNTRY_INTERNATIONAL_ISO 13 + #define APPLE_BATTERY_TIMEOUT_MS 60000 + +-static unsigned int fnmode = 1; ++static unsigned int fnmode = 3; + module_param(fnmode, uint, 0644); + MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, " +- "[1] = fkeyslast, 2 = fkeysfirst)"); ++ "1 = fkeyslast, 2 = fkeysfirst, [3] = auto)"); + + static int iso_layout = -1; + module_param(iso_layout, int, 0644); +@@ -349,6 +351,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, + const struct apple_key_translation *trans, *table; + bool do_translate; + u16 code = 0; ++ unsigned int real_fnmode; + + u16 fn_keycode = (swap_fn_leftctrl) ? (KEY_LEFTCTRL) : (KEY_FN); + +@@ -359,7 +362,13 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, + return 1; + } + +- if (fnmode) { ++ if (fnmode == 3) { ++ real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1; ++ } else { ++ real_fnmode = fnmode; ++ } ++ ++ if (real_fnmode) { + if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI || + hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO || + hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS || +@@ -406,7 +415,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, + + if (!code) { + if (trans->flags & APPLE_FLAG_FKEY) { +- switch (fnmode) { ++ switch (real_fnmode) { + case 1: + do_translate = !asc->fn_on; + break; +@@ -660,6 +669,11 @@ static int apple_input_configured(struct hid_device *hdev, + asc->quirks &= ~APPLE_HAS_FN; + } + ++ if (strncmp(hdev->name, "Keychron", 8) == 0) { ++ hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n"); ++ asc->quirks |= APPLE_IS_KEYCHRON; ++ } ++ + return 0; + } + +-- +2.37.1 + diff --git a/libre/linux-libre-pae/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch b/libre/linux-libre-pae/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch deleted file mode 100644 index 356e254..0000000 --- a/libre/linux-libre-pae/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 5e79fc7d70e5c6e409254060066e7ab1b1d1a768 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Wed, 23 Mar 2022 23:09:30 -0600 -Subject: [PATCH 2/7] random: treat bootloader trust toggle the same way as cpu - trust toggle - -If CONFIG_RANDOM_TRUST_CPU is set, the RNG initializes using RDRAND. -But, the user can disable (or enable) this behavior by setting -`random.trust_cpu=0/1` on the kernel command line. This allows system -builders to do reasonable things while avoiding howls from tinfoil -hatters. (Or vice versa.) - -CONFIG_RANDOM_TRUST_BOOTLOADER is basically the same thing, but regards -the seed passed via EFI or device tree, which might come from RDRAND or -a TPM or somewhere else. In order to allow distros to more easily enable -this while avoiding those same howls (or vice versa), this commit adds -the corresponding `random.trust_bootloader=0/1` toggle. - -Cc: Theodore Ts'o -Cc: Graham Christensen -Reviewed-by: Ard Biesheuvel -Reviewed-by: Dominik Brodowski -Link: https://github.com/NixOS/nixpkgs/pull/165355 -Signed-off-by: Jason A. Donenfeld ---- - Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ - drivers/char/Kconfig | 3 ++- - drivers/char/random.c | 8 +++++++- - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 59f881f36779..bdc733c2561d 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4355,6 +4355,12 @@ - fully seed the kernel's CRNG. Default is controlled - by CONFIG_RANDOM_TRUST_CPU. - -+ random.trust_bootloader={on,off} -+ [KNL] Enable or disable trusting the use of the -+ a seed passed by the bootloader (if available) to -+ fully seed the kernel's CRNG. Default is controlled -+ by CONFIG_RANDOM_TRUST_BOOTLOADER. -+ - randomize_kstack_offset= - [KNL] Enable or disable kernel stack offset - randomization, which provides roughly 5 bits of -diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 740811893c57..55f48375e3fe 100644 ---- a/drivers/char/Kconfig -+++ b/drivers/char/Kconfig -@@ -449,6 +449,7 @@ config RANDOM_TRUST_BOOTLOADER - device randomness. Say Y here to assume the entropy provided by the - booloader is trustworthy so it will be added to the kernel's entropy - pool. Otherwise, say N here so it will be regarded as device input that -- only mixes the entropy pool. -+ only mixes the entropy pool. This can also be configured at boot with -+ "random.trust_bootloader=on/off". - - endmenu -diff --git a/drivers/char/random.c b/drivers/char/random.c -index 3404a91edf29..19bf14e253f7 100644 ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -738,11 +738,17 @@ static void invalidate_batched_entropy(void); - static void numa_crng_init(void); - - static bool trust_cpu __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_CPU); -+static bool trust_bootloader __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER); - static int __init parse_trust_cpu(char *arg) - { - return kstrtobool(arg, &trust_cpu); - } -+static int __init parse_trust_bootloader(char *arg) -+{ -+ return kstrtobool(arg, &trust_bootloader); -+} - early_param("random.trust_cpu", parse_trust_cpu); -+early_param("random.trust_bootloader", parse_trust_bootloader); - - static bool crng_init_try_arch(struct crng_state *crng) - { -@@ -2229,7 +2235,7 @@ EXPORT_SYMBOL_GPL(add_hwgenerator_randomness); - */ - void add_bootloader_randomness(const void *buf, unsigned int size) - { -- if (IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER)) -+ if (trust_bootloader) - add_hwgenerator_randomness(buf, size, size * 8); - else - add_device_randomness(buf, size); --- -2.36.1 - diff --git a/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch b/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch new file mode 100644 index 0000000..606afbd --- /dev/null +++ b/libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch @@ -0,0 +1,26 @@ +From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 23 Jul 2022 11:14:46 +0200 +Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms + +See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300 +--- + drivers/soundwire/bus.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h +index 7631ef5e71fb..d3ed828daac0 100644 +--- a/drivers/soundwire/bus.h ++++ b/drivers/soundwire/bus.h +@@ -5,7 +5,7 @@ + #define __SDW_BUS_H + + #define DEFAULT_BANK_SWITCH_TIMEOUT 3000 +-#define DEFAULT_PROBE_TIMEOUT 2000 ++#define DEFAULT_PROBE_TIMEOUT 10000 + + u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr); + +-- +2.37.1 + diff --git a/libre/linux-libre-pae/0003-tick-Detect-and-fix-jiffies-update-stall.patch b/libre/linux-libre-pae/0003-tick-Detect-and-fix-jiffies-update-stall.patch deleted file mode 100644 index 0d1985b..0000000 --- a/libre/linux-libre-pae/0003-tick-Detect-and-fix-jiffies-update-stall.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 03b70547975933214e3edcbb3c99e05142172266 Mon Sep 17 00:00:00 2001 -From: Frederic Weisbecker -Date: Wed, 2 Feb 2022 01:01:07 +0100 -Subject: [PATCH 3/7] tick: Detect and fix jiffies update stall - -On some rare cases, the timekeeper CPU may be delaying its jiffies -update duty for a while. Known causes include: - -* The timekeeper is waiting on stop_machine in a MULTI_STOP_DISABLE_IRQ - or MULTI_STOP_RUN state. Disabled interrupts prevent from timekeeping - updates while waiting for the target CPU to complete its - stop_machine() callback. - -* The timekeeper vcpu has VMEXIT'ed for a long while due to some overload - on the host. - -Detect and fix these situations with emergency timekeeping catchups. - -Original-patch-by: Paul E. McKenney -Signed-off-by: Frederic Weisbecker -Cc: Thomas Gleixner ---- - kernel/time/tick-sched.c | 17 +++++++++++++++++ - kernel/time/tick-sched.h | 4 ++++ - 2 files changed, 21 insertions(+) - -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index 5e80ee44c32a..0578c9301b17 100644 ---- a/kernel/time/tick-sched.c -+++ b/kernel/time/tick-sched.c -@@ -169,6 +169,8 @@ static ktime_t tick_init_jiffy_update(void) - return period; - } - -+#define MAX_STALLED_JIFFIES 5 -+ - static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now) - { - int cpu = smp_processor_id(); -@@ -196,6 +198,21 @@ static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now) - if (tick_do_timer_cpu == cpu) - tick_do_update_jiffies64(now); - -+ /* -+ * If jiffies update stalled for too long (timekeeper in stop_machine() -+ * or VMEXIT'ed for several msecs), force an update. -+ */ -+ if (ts->last_tick_jiffies != jiffies) { -+ ts->stalled_jiffies = 0; -+ ts->last_tick_jiffies = READ_ONCE(jiffies); -+ } else { -+ if (++ts->stalled_jiffies == MAX_STALLED_JIFFIES) { -+ tick_do_update_jiffies64(now); -+ ts->stalled_jiffies = 0; -+ ts->last_tick_jiffies = READ_ONCE(jiffies); -+ } -+ } -+ - if (ts->inidle) - ts->got_idle_tick = 1; - } -diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h -index d952ae393423..504649513399 100644 ---- a/kernel/time/tick-sched.h -+++ b/kernel/time/tick-sched.h -@@ -49,6 +49,8 @@ enum tick_nohz_mode { - * @timer_expires_base: Base time clock monotonic for @timer_expires - * @next_timer: Expiry time of next expiring timer for debugging purpose only - * @tick_dep_mask: Tick dependency mask - is set, if someone needs the tick -+ * @last_tick_jiffies: Value of jiffies seen on last tick -+ * @stalled_jiffies: Number of stalled jiffies detected across ticks - */ - struct tick_sched { - struct hrtimer sched_timer; -@@ -77,6 +79,8 @@ struct tick_sched { - u64 next_timer; - ktime_t idle_expires; - atomic_t tick_dep_mask; -+ unsigned long last_tick_jiffies; -+ unsigned int stalled_jiffies; - }; - - extern struct tick_sched *tick_get_tick_sched(int cpu); --- -2.36.1 - diff --git a/libre/linux-libre-pae/0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch b/libre/linux-libre-pae/0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch deleted file mode 100644 index a63635d..0000000 --- a/libre/linux-libre-pae/0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 1f17192df29b2410380147075754e8f40dc7af5b Mon Sep 17 00:00:00 2001 -From: Frederic Weisbecker -Date: Tue, 8 Feb 2022 17:16:33 +0100 -Subject: [PATCH 4/7] tick/rcu: Remove obsolete rcu_needs_cpu() parameters - -With the removal of CONFIG_RCU_FAST_NO_HZ, the parameters in -rcu_needs_cpu() are not necessary anymore. Simply remove them. - -Signed-off-by: Frederic Weisbecker -Cc: Thomas Gleixner -Cc: Peter Zijlstra -Cc: Paul E. McKenney -Cc: Paul Menzel ---- - include/linux/rcutiny.h | 3 +-- - include/linux/rcutree.h | 2 +- - kernel/rcu/tree.c | 3 +-- - kernel/time/tick-sched.c | 10 ++++------ - 4 files changed, 7 insertions(+), 11 deletions(-) - -diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h -index 858f4d429946..5fed476f977f 100644 ---- a/include/linux/rcutiny.h -+++ b/include/linux/rcutiny.h -@@ -64,9 +64,8 @@ static inline void rcu_softirq_qs(void) - rcu_tasks_qs(current, (preempt)); \ - } while (0) - --static inline int rcu_needs_cpu(u64 basemono, u64 *nextevt) -+static inline int rcu_needs_cpu(void) - { -- *nextevt = KTIME_MAX; - return 0; - } - -diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h -index 53209d669400..6cc91291d078 100644 ---- a/include/linux/rcutree.h -+++ b/include/linux/rcutree.h -@@ -19,7 +19,7 @@ - - void rcu_softirq_qs(void); - void rcu_note_context_switch(bool preempt); --int rcu_needs_cpu(u64 basem, u64 *nextevt); -+int rcu_needs_cpu(void); - void rcu_cpu_stall_reset(void); - - /* -diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c -index 73a4c9d07b86..5dae0da879ae 100644 ---- a/kernel/rcu/tree.c -+++ b/kernel/rcu/tree.c -@@ -1086,9 +1086,8 @@ void rcu_irq_enter_irqson(void) - * Just check whether or not this CPU has non-offloaded RCU callbacks - * queued. - */ --int rcu_needs_cpu(u64 basemono, u64 *nextevt) -+int rcu_needs_cpu(void) - { -- *nextevt = KTIME_MAX; - return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) && - !rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data)); - } -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index 0578c9301b17..4c62fa0f70f1 100644 ---- a/kernel/time/tick-sched.c -+++ b/kernel/time/tick-sched.c -@@ -785,7 +785,7 @@ static inline bool local_timer_softirq_pending(void) - - static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu) - { -- u64 basemono, next_tick, next_tmr, next_rcu, delta, expires; -+ u64 basemono, next_tick, delta, expires; - unsigned long basejiff; - unsigned int seq; - -@@ -808,7 +808,7 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu) - * minimal delta which brings us back to this place - * immediately. Lather, rinse and repeat... - */ -- if (rcu_needs_cpu(basemono, &next_rcu) || arch_needs_cpu() || -+ if (rcu_needs_cpu() || arch_needs_cpu() || - irq_work_needs_cpu() || local_timer_softirq_pending()) { - next_tick = basemono + TICK_NSEC; - } else { -@@ -819,10 +819,8 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu) - * disabled this also looks at the next expiring - * hrtimer. - */ -- next_tmr = get_next_timer_interrupt(basejiff, basemono); -- ts->next_timer = next_tmr; -- /* Take the next rcu event into account */ -- next_tick = next_rcu < next_tmr ? next_rcu : next_tmr; -+ next_tick = get_next_timer_interrupt(basejiff, basemono); -+ ts->next_timer = next_tick; - } - - /* --- -2.36.1 - diff --git a/libre/linux-libre-pae/0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch b/libre/linux-libre-pae/0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch deleted file mode 100644 index 161be88..0000000 --- a/libre/linux-libre-pae/0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 68deadf9632ac7c3044f20ad630f13dc11cb66ab Mon Sep 17 00:00:00 2001 -From: Frederic Weisbecker -Date: Tue, 8 Feb 2022 17:16:34 +0100 -Subject: [PATCH 5/7] tick/rcu: Stop allowing RCU_SOFTIRQ in idle - -RCU_SOFTIRQ used to be special in that it could be raised on purpose -within the idle path to prevent from stopping the tick. Some code still -prevents from unnecessary warnings related to this specific behaviour -while entering in dynticks-idle mode. - -However the nohz layout has changed quite a bit in ten years, and the -removal of CONFIG_RCU_FAST_NO_HZ has been the final straw to this -safe-conduct. Now the RCU_SOFTIRQ vector is expected to be raised from -sane places. - -A remaining corner case is admitted though when the vector is invoked -in fragile hotplug path. - -Signed-off-by: Frederic Weisbecker -Cc: Thomas Gleixner -Cc: Peter Zijlstra -Cc: Paul E. McKenney -Cc: Paul Menzel ---- - include/linux/interrupt.h | 8 ++++++- - kernel/time/tick-sched.c | 50 +++++++++++++++++++++++++++++++-------- - 2 files changed, 47 insertions(+), 11 deletions(-) - -diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h -index 9367f1cb2e3c..9613326d2f8a 100644 ---- a/include/linux/interrupt.h -+++ b/include/linux/interrupt.h -@@ -579,7 +579,13 @@ enum - NR_SOFTIRQS - }; - --#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ)) -+/* -+ * Ignoring the RCU vector after ksoftirqd is parked is fine -+ * because: -+ * 1) rcutree_migrate_callbacks() takes care of the queue. -+ * 2) rcu_report_dead() reports the final quiescent states. -+ */ -+#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ)) - - /* map softirq index to softirq name. update 'softirq_to_name' in - * kernel/softirq.c when adding a new softirq. -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index 4c62fa0f70f1..3506f6ed790c 100644 ---- a/kernel/time/tick-sched.c -+++ b/kernel/time/tick-sched.c -@@ -999,6 +999,45 @@ static void tick_nohz_full_update_tick(struct tick_sched *ts) - __tick_nohz_full_update_tick(ts, ktime_get()); - } - -+/* -+ * A pending softirq outside an IRQ (or softirq disabled section) context -+ * should be waiting for ksoftirqd to handle it. Therefore we shouldn't -+ * reach here due to the need_resched() early check in can_stop_idle_tick(). -+ * -+ * However if we are between CPUHP_AP_SMPBOOT_THREADS and CPU_TEARDOWN_CPU on the -+ * cpu_down() process, softirqs can still be raised while ksoftirqd is parked, -+ * triggering the below since wakep_softirqd() is ignored. -+ * -+ */ -+static bool report_idle_softirq(void) -+{ -+ static int ratelimit; -+ unsigned int pending = local_softirq_pending(); -+ -+ if (likely(!pending)) -+ return false; -+ -+ /* Some softirqs claim to be safe against hotplug and ksoftirqd parking */ -+ if (!cpu_active(smp_processor_id())) { -+ pending &= ~SOFTIRQ_HOTPLUG_SAFE_MASK; -+ if (!pending) -+ return false; -+ } -+ -+ if (ratelimit < 10) -+ return false; -+ -+ /* On RT, softirqs handling may be waiting on some lock */ -+ if (!local_bh_blocked()) -+ return false; -+ -+ pr_warn("NOHZ tick-stop error: local softirq work is pending, handler #%02x!!!\n", -+ pending); -+ ratelimit++; -+ -+ return true; -+} -+ - static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) - { - /* -@@ -1025,17 +1064,8 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) - if (need_resched()) - return false; - -- if (unlikely(local_softirq_pending())) { -- static int ratelimit; -- -- if (ratelimit < 10 && !local_bh_blocked() && -- (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) { -- pr_warn("NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #%02x!!!\n", -- (unsigned int) local_softirq_pending()); -- ratelimit++; -- } -+ if (unlikely(report_idle_softirq())) - return false; -- } - - if (tick_nohz_full_enabled()) { - /* --- -2.36.1 - diff --git a/libre/linux-libre-pae/0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch b/libre/linux-libre-pae/0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch deleted file mode 100644 index a779818..0000000 --- a/libre/linux-libre-pae/0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c4d817dfd4c11840db24143aa39e9e437f05bc33 Mon Sep 17 00:00:00 2001 -From: Frederic Weisbecker -Date: Tue, 8 Feb 2022 17:16:35 +0100 -Subject: [PATCH 6/7] lib/irq_poll: Declare IRQ_POLL softirq vector as - ksoftirqd-parking safe - -The following warning may appear while setting a CPU down: - - NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #20!!! - -The IRQ_POLL_SOFTIRQ vector can be raised during the hotplug cpu_down() -path after ksoftirqd is parked and before the CPU actually dies. However -this is handled afterward at the CPUHP_IRQ_POLL_DEAD stage where the -queue gets migrated. - -Hence this warning can be considered spurious and the vector can join -the "hotplug-safe" list. - -Reported-and-tested-by: Paul Menzel -Signed-off-by: Frederic Weisbecker -Cc: Thomas Gleixner -Cc: Peter Zijlstra -Cc: Paul E. McKenney -Cc: Paul Menzel ---- - include/linux/interrupt.h | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h -index 9613326d2f8a..f40754caaefa 100644 ---- a/include/linux/interrupt.h -+++ b/include/linux/interrupt.h -@@ -580,12 +580,15 @@ enum - }; - - /* -- * Ignoring the RCU vector after ksoftirqd is parked is fine -- * because: -- * 1) rcutree_migrate_callbacks() takes care of the queue. -+ * The following vectors can be safely ignored after ksoftirqd is parked: -+ * -+ * _ RCU: -+ * 1) rcutree_migrate_callbacks() migrates the queue. - * 2) rcu_report_dead() reports the final quiescent states. -+ * -+ * _ IRQ_POLL: irq_poll_cpu_dead() migrates the queue - */ --#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ)) -+#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ) | BIT(IRQ_POLL_SOFTIRQ)) - - /* map softirq index to softirq name. update 'softirq_to_name' in - * kernel/softirq.c when adding a new softirq. --- -2.36.1 - diff --git a/libre/linux-libre-pae/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch b/libre/linux-libre-pae/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch deleted file mode 100644 index 0b06ca2..0000000 --- a/libre/linux-libre-pae/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch +++ /dev/null @@ -1,81 +0,0 @@ -From cf8e6ac5eabd91ea2ed8eb7dbf12718bfd5cb9b8 Mon Sep 17 00:00:00 2001 -From: Olga Kornievskaia -Date: Wed, 16 Mar 2022 18:24:26 -0400 -Subject: [PATCH 7/7] NFSv4.1 provide mount option to toggle trunking discovery - -Introduce a new mount option -- trunkdiscovery,notrunkdiscovery -- to -toggle whether or not the client will engage in actively discovery -of trunking locations. - -v2 make notrunkdiscovery default - -Signed-off-by: Olga Kornievskaia -Cherry-picked-for: https://bugs.archlinux.org/task/74272 ---- - fs/nfs/client.c | 3 ++- - fs/nfs/fs_context.c | 8 ++++++++ - include/linux/nfs_fs_sb.h | 1 + - 3 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/fs/nfs/client.c b/fs/nfs/client.c -index d1f34229e11a..e828504cc396 100644 ---- a/fs/nfs/client.c -+++ b/fs/nfs/client.c -@@ -857,7 +857,8 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str - } - - if (clp->rpc_ops->discover_trunking != NULL && -- (server->caps & NFS_CAP_FS_LOCATIONS)) { -+ (server->caps & NFS_CAP_FS_LOCATIONS && -+ (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) { - error = clp->rpc_ops->discover_trunking(server, mntfh); - if (error < 0) - return error; -diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c -index d20891162145..9a16897e8dc6 100644 ---- a/fs/nfs/fs_context.c -+++ b/fs/nfs/fs_context.c -@@ -80,6 +80,7 @@ enum nfs_param { - Opt_source, - Opt_tcp, - Opt_timeo, -+ Opt_trunkdiscovery, - Opt_udp, - Opt_v, - Opt_vers, -@@ -180,6 +181,7 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = { - fsparam_string("source", Opt_source), - fsparam_flag ("tcp", Opt_tcp), - fsparam_u32 ("timeo", Opt_timeo), -+ fsparam_flag_no("trunkdiscovery", Opt_trunkdiscovery), - fsparam_flag ("udp", Opt_udp), - fsparam_flag ("v2", Opt_v), - fsparam_flag ("v3", Opt_v), -@@ -529,6 +531,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc, - else - ctx->flags &= ~NFS_MOUNT_NOCTO; - break; -+ case Opt_trunkdiscovery: -+ if (result.negated) -+ ctx->flags &= ~NFS_MOUNT_TRUNK_DISCOVERY; -+ else -+ ctx->flags |= NFS_MOUNT_TRUNK_DISCOVERY; -+ break; - case Opt_ac: - if (result.negated) - ctx->flags |= NFS_MOUNT_NOAC; -diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h -index ca0959e51e81..b0e3fd550122 100644 ---- a/include/linux/nfs_fs_sb.h -+++ b/include/linux/nfs_fs_sb.h -@@ -151,6 +151,7 @@ struct nfs_server { - #define NFS_MOUNT_SOFTREVAL 0x800000 - #define NFS_MOUNT_WRITE_EAGER 0x01000000 - #define NFS_MOUNT_WRITE_WAIT 0x02000000 -+#define NFS_MOUNT_TRUNK_DISCOVERY 0x04000000 - - unsigned int fattr_valid; /* Valid attributes */ - unsigned int caps; /* server capabilities */ --- -2.36.1 - diff --git a/libre/linux-libre-pae/PKGBUILD b/libre/linux-libre-pae/PKGBUILD index a80aace..556683c 100644 --- a/libre/linux-libre-pae/PKGBUILD +++ b/libre/linux-libre-pae/PKGBUILD @@ -9,7 +9,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-pae -pkgver=5.17.9 +pkgver=5.18.14 pkgrel=1 pkgdesc='Linux-libre PAE (physical address extension)' url='https://linux-libre.fsfla.org/' @@ -20,7 +20,7 @@ makedepends=( xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra ) options=('!strip') -_srcname=linux-5.17 +_srcname=linux-5.18 source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign} @@ -36,12 +36,8 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch - 0003-tick-Detect-and-fix-jiffies-update-stall.patch - 0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch - 0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch - 0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch - 0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch + 0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch + 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch # Arch Linux 32 patches no-ultra-zstd.patch ) @@ -49,9 +45,9 @@ validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. ) -sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c' +sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' 'SKIP' - '921c4e1eca023c3a0f756ec788188e0d8c5b0622c832516c32e87f964e90769c7072f41785f1bfde1344fcd829332834a959313fd4db69cab20227eeba4141aa' + '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -59,16 +55,12 @@ sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '55fdec0555ef18aaaba22ff6cdad477c6c80b5dd3b0477b39e7099b3838376f8c3b42e44f579758d8e764d5a4750f6fc8378e2d5b05536cdebb17c13f734c695' + '145f8eb30125ee4bf1e2b37027ec762d2a15511dcf7eae3ad09472a682492d8f38fb606b2e81acac557de318a71b6d988b03c8680208b75c2be9bc1483b43e10' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '9543379c1feba5585196396cc3ca6b9b957b967bdac29c502867ffb502743e1793c4a9ccdca4c30226120793df7bf887fb0cdf365d9304594777c16a0addd63b' - '37719ac336936ba70ef58d63e409a3df36a06f885205595ee55a20bdb6a801c698cb5412fa19398f375c111634713c4bee1619bf08429830ab02ff5fe257ef6c' - '44acd1454ad7faa4e993597bff67899a14e85e030f948db8590d12fc4eb05fb732e53e9a96bb59972ec319e54c160bbbee7c1568cdc199342afa4088b4a5eee3' - '0e1ea62e127883826655fa74c232ef3b8537fe0a1a2c7b89a710f43ce0b7b483e1b5bc14fa44cffae5aaadfd9c5b88b5e326d5feca9bf2fb922844bd6309f855' - '0c40c8a99e202dd869c54964495fd8005efbbd74679901bd976fa297b8d65554a8071345da3b171ef95d7fd2515588d05f09cf2ca6c86b0bcc9ff0468c997482' - 'b0c2bef3e76a25640539a6814bf8a120d000995d1d88c80b667b9bd1e489a452da47ee01b96cd0104f0a7627d5ff7ff916506f137f6cd6fb4df4f666bf2d92be' - '251d94b05ba7b252eef738efd8a5d75ec26df11bcd4e99b468db89cb370f56cc56e949b2fb1a7d00c61ded49fa0e0355551ea98f46662d4220cddacf5640e40b' + '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406' + '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753' + '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce' 'bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") @@ -116,8 +108,7 @@ prepare() { build() { cd $_srcname - make all - make htmldocs + make htmldocs all } _package() { diff --git a/libre/linux-libre-pae/config b/libre/linux-libre-pae/config index 9291e73..7e6b522 100644 --- a/libre/linux-libre-pae/config +++ b/libre/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8-gnu Kernel Configuration +# Linux/x86 5.18.14-gnu Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -15,8 +15,10 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_PAHOLE_VERSION=123 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -100,6 +102,7 @@ CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100 # end of Timers subsystem CONFIG_BPF=y @@ -179,6 +182,8 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y @@ -309,11 +314,9 @@ CONFIG_GENERIC_BUG=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -328,8 +331,6 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y CONFIG_X86_CPU_RESCTRL=y CONFIG_X86_BIGSMP=y # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -432,7 +433,6 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=y # CONFIG_X86_LEGACY_VM86 is not set CONFIG_X86_IOPL_IOPERM=y CONFIG_TOSHIBA=m -CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y # CONFIG_MICROCODE_INTEL is not set @@ -455,7 +455,6 @@ CONFIG_NUMA=y CONFIG_NODES_SHIFT=3 CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 # CONFIG_X86_PMEM_LEGACY is not set # CONFIG_HIGHPTE is not set @@ -470,6 +469,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_X86_UMIP=y +CONFIG_CC_HAS_IBT=y CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set @@ -498,6 +498,15 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_PAGE_TABLE_ISOLATION=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -711,7 +720,6 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m # CONFIG_KVM_XEN is not set -CONFIG_KVM_MMU_AUDIT=y CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y @@ -734,6 +742,7 @@ CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y +CONFIG_KRETPROBE_ON_RETHOOK=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -808,6 +817,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +CONFIG_RANDOMIZE_KSTACK_OFFSET=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y @@ -819,6 +829,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_PREEMPT_DYNAMIC=y +CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPLIT_ARG64=y @@ -858,6 +869,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y +CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_ICQ=y @@ -909,6 +921,7 @@ CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y CONFIG_BLK_PM=y CONFIG_BLOCK_HOLDER_DEPRECATED=y +CONFIG_BLK_MQ_STACKING=y # # IO Schedulers @@ -951,8 +964,6 @@ CONFIG_COREDUMP=y # # Memory Management options # -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_FAST_GUP=y @@ -975,6 +986,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_TRANSPARENT_HUGEPAGE=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y @@ -1006,6 +1018,8 @@ CONFIG_ZSMALLOC=y CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HAS_ZONE_DMA_SET=y CONFIG_ZONE_DMA=y CONFIG_HMM_MIRROR=y @@ -2045,6 +2059,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y +# CONFIG_PAGE_POOL_STATS is not set CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y @@ -2088,6 +2103,8 @@ CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set # CONFIG_PCIE_BUS_PERFORMANCE is not set # CONFIG_PCIE_BUS_PEER2PEER is not set +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set @@ -2294,6 +2311,7 @@ CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y CONFIG_EFI_EARLYCON=y CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set # # Tegra firmware driver @@ -2461,6 +2479,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set # CONFIG_MTD_NAND_ECC_SW_BCH is not set +CONFIG_MTD_NAND_ECC_MXIC=y # end of ECC engine support # end of NAND @@ -2476,9 +2495,6 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y # CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set -CONFIG_SPI_INTEL_SPI=m -CONFIG_SPI_INTEL_SPI_PCI=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -2554,6 +2570,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_NVME_CORE=y CONFIG_BLK_DEV_NVME=y CONFIG_NVME_MULTIPATH=y +# CONFIG_NVME_VERBOSE_ERRORS is not set # CONFIG_NVME_HWMON is not set CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m @@ -3202,6 +3219,8 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y CONFIG_GEMINI_ETHERNET=m +CONFIG_NET_VENDOR_DAVICOM=y +# CONFIG_DM9051 is not set CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3234,6 +3253,8 @@ CONFIG_NET_VENDOR_EZCHIP=y CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_FUJITSU=y CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_FUN_ETH is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_GVE=m CONFIG_NET_VENDOR_HUAWEI=y @@ -3819,6 +3840,7 @@ CONFIG_MT7615E=m # CONFIG_MT7915E is not set # CONFIG_MT7921E is not set # CONFIG_MT7921S is not set +# CONFIG_MT7921U is not set CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m @@ -3978,6 +4000,7 @@ CONFIG_INPUT_LEDS=m CONFIG_INPUT_FF_MEMLESS=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m +CONFIG_INPUT_VIVALDIFMAP=m # # Userland interfaces @@ -4158,6 +4181,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MELFAS_MIP4=m # CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m @@ -4395,7 +4419,6 @@ CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_I2C=y CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_BCM63XX is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 @@ -4541,6 +4564,7 @@ CONFIG_I2C_ALGOPCA=m # # PC SMBus host controller drivers # +CONFIG_I2C_CCGX_UCSI=m CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m CONFIG_I2C_ALI15X3=m @@ -4574,6 +4598,7 @@ CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_SLAVE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y +# CONFIG_I2C_DESIGNWARE_AMDPSP is not set CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m @@ -4649,6 +4674,8 @@ CONFIG_SPI_DLN2=m CONFIG_SPI_FSI=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m +# CONFIG_SPI_INTEL_PCI is not set +# CONFIG_SPI_INTEL_PLATFORM is not set CONFIG_SPI_LM70_LLP=m CONFIG_SPI_FSL_LIB=m CONFIG_SPI_FSL_SPI=m @@ -4980,6 +5007,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y CONFIG_PDA_POWER=m CONFIG_GENERIC_ADC_BATTERY=m +# CONFIG_IP5XXX_POWER is not set CONFIG_MAX8925_POWER=m CONFIG_WM831X_BACKUP=m CONFIG_WM831X_POWER=m @@ -4994,6 +5022,7 @@ CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_DS2780=m CONFIG_BATTERY_DS2781=m CONFIG_BATTERY_DS2782=m +# CONFIG_BATTERY_SAMSUNG_SDI is not set CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m CONFIG_MANAGER_SBS=m @@ -5053,6 +5082,7 @@ CONFIG_CHARGER_CROS_PCHG=m CONFIG_CHARGER_UCS1002=m # CONFIG_CHARGER_BD99954 is not set CONFIG_CHARGER_WILCO=m +# CONFIG_BATTERY_UG3105 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5097,6 +5127,7 @@ CONFIG_SENSORS_DRIVETEMP=m CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_DELL_SMM=m +# CONFIG_I8K is not set CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_DA9055=m CONFIG_SENSORS_I5K_AMB=m @@ -5199,6 +5230,7 @@ CONFIG_SENSORS_IR38064=m CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_LM25066=m +# CONFIG_SENSORS_LM25066_REGULATOR is not set CONFIG_SENSORS_LTC2978=m # CONFIG_SENSORS_LTC2978_REGULATOR is not set CONFIG_SENSORS_LTC3815=m @@ -5214,6 +5246,7 @@ CONFIG_SENSORS_MAX8688=m # CONFIG_SENSORS_MP2975 is not set # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_PIM4328 is not set +# CONFIG_SENSORS_PLI1209BC is not set # CONFIG_SENSORS_PM6764TR is not set CONFIG_SENSORS_PXE1610=m # CONFIG_SENSORS_Q54SJ108A2 is not set @@ -5223,6 +5256,7 @@ CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_XDPE122=m +# CONFIG_SENSORS_XDPE122_REGULATOR is not set CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SBTSI is not set @@ -5233,6 +5267,7 @@ CONFIG_SENSORS_SHT3x=m # CONFIG_SENSORS_SHT4x is not set CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m +# CONFIG_SENSORS_SY7636A is not set CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -5260,6 +5295,7 @@ CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP108=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m +# CONFIG_SENSORS_TMP464 is not set # CONFIG_SENSORS_TMP513 is not set CONFIG_SENSORS_VIA_CPUTEMP=m CONFIG_SENSORS_VIA686A=m @@ -5287,6 +5323,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m # CONFIG_SENSORS_ASUS_WMI is not set # CONFIG_SENSORS_ASUS_WMI_EC is not set +# CONFIG_SENSORS_ASUS_EC is not set CONFIG_THERMAL=y # CONFIG_THERMAL_NETLINK is not set # CONFIG_THERMAL_STATISTICS is not set @@ -5329,6 +5366,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INTEL_PCH_THERMAL=m # CONFIG_INTEL_TCC_COOLING is not set CONFIG_INTEL_MENLOW=m +# CONFIG_INTEL_HFI_THERMAL is not set # end of Intel thermal drivers # CONFIG_TI_SOC_THERMAL is not set @@ -5527,6 +5565,7 @@ CONFIG_MFD_MAX77620=y CONFIG_MFD_MAX77650=m CONFIG_MFD_MAX77686=m CONFIG_MFD_MAX77693=m +# CONFIG_MFD_MAX77714 is not set CONFIG_MFD_MAX77843=y CONFIG_MFD_MAX8907=m CONFIG_MFD_MAX8925=y @@ -5552,6 +5591,7 @@ CONFIG_MFD_RK808=m CONFIG_MFD_RN5T618=m CONFIG_MFD_SEC_CORE=y CONFIG_MFD_SI476X_CORE=m +# CONFIG_MFD_SIMPLE_MFD_I2C is not set CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SKY81452=m @@ -5723,6 +5763,7 @@ CONFIG_REGULATOR_RN5T618=m CONFIG_REGULATOR_ROHM=m # CONFIG_REGULATOR_RT4801 is not set CONFIG_REGULATOR_RT5033=m +# CONFIG_REGULATOR_RT5190A is not set # CONFIG_REGULATOR_RT6160 is not set # CONFIG_REGULATOR_RT6245 is not set # CONFIG_REGULATOR_RTQ2134 is not set @@ -5734,12 +5775,14 @@ CONFIG_REGULATOR_S5M8767=m CONFIG_REGULATOR_SKY81452=m CONFIG_REGULATOR_SLG51000=m CONFIG_REGULATOR_STPMIC1=m +# CONFIG_REGULATOR_SY7636A is not set CONFIG_REGULATOR_SY8106A=m CONFIG_REGULATOR_SY8824X=m CONFIG_REGULATOR_SY8827N=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS62360=m +# CONFIG_REGULATOR_TPS6286X is not set CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m CONFIG_REGULATOR_TPS65086=m @@ -5759,45 +5802,45 @@ CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m CONFIG_REGULATOR_QCOM_LABIBB=m CONFIG_RC_CORE=m -CONFIG_RC_MAP=m CONFIG_LIRC=y +CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RCMM_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_SONY_DECODER=m CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_IR_RCMM_DECODER=m CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m +CONFIG_IR_FINTEK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m +CONFIG_IR_MCEUSB=m CONFIG_IR_NUVOTON=m +CONFIG_IR_PWM_TX=m CONFIG_IR_REDRAT3=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m +CONFIG_IR_TOY=m CONFIG_IR_TTUSBIR=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_ATI_REMOTE=m CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_IR_GPIO_TX=m -CONFIG_IR_PWM_TX=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_RC_XBOX_DVD=m -CONFIG_IR_TOY=m CONFIG_CEC_CORE=m CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y @@ -5843,7 +5886,6 @@ CONFIG_DVB_CORE=m # # Video4Linux options # -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -5879,17 +5921,17 @@ CONFIG_DVB_MAX_ADAPTERS=16 # # Media drivers # + +# +# Media drivers +# CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m @@ -5914,13 +5956,13 @@ CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SPCA500=m CONFIG_USB_GSPCA_SPCA501=m CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m @@ -5936,29 +5978,33 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_GL860=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m +CONFIG_USB_STKWEBCAM=m CONFIG_VIDEO_USBTV=m +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m # # Analog TV USB devices # +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m # # Analog/digital TV USB devices @@ -5977,34 +6023,9 @@ CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -# CONFIG_DVB_USB_CXUSB_ANALOG is not set -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_AS102=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m @@ -6012,19 +6033,44 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_CXUSB=m +# CONFIG_DVB_USB_CXUSB_ANALOG is not set +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_VP7045=m +CONFIG_SMS_USB_DRV=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices @@ -6055,6 +6101,7 @@ CONFIG_VIDEO_TW686X=m # # Media capture/analog TV support # +CONFIG_VIDEO_DT3155=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_FB_IVTV=m @@ -6062,11 +6109,12 @@ CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m # # Media capture/analog/hybrid TV support # +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -6080,8 +6128,6 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_ENABLE_VP3054=y CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -6092,221 +6138,202 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m +CONFIG_DVB_NETUP_UNIDVB=m CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m # CONFIG_CIO2_BRIDGE is not set -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_RADIO_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m +CONFIG_USB_DSBR=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_USB_MR800=m +CONFIG_USB_RAREMONO=m CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_TTPCI_EEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set -CONFIG_VIDEO_V4L2_TPG=m +CONFIG_MEDIA_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -# CONFIG_VIDEO_CADENCE is not set -CONFIG_VIDEO_ASPEED=m -CONFIG_VIDEO_MUX=m -CONFIG_VIDEO_XILINX=m -CONFIG_VIDEO_XILINX_CSI2RXSS=m -CONFIG_VIDEO_XILINX_TPG=m -CONFIG_VIDEO_XILINX_VTC=m +CONFIG_SDR_PLATFORM_DRIVERS=y +CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_DVB_PLATFORM_DRIVERS=y -CONFIG_SDR_PLATFORM_DRIVERS=y +CONFIG_VIDEO_MUX=m # -# MMC/SDIO DVB adapters +# Allegro DVT media platform drivers # -CONFIG_SMS_SDIO_DRV=m -CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VIDEO_VIMC=m -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -CONFIG_VIDEO_VIM2M=m -CONFIG_VIDEO_VICODEC=m -# CONFIG_DVB_TEST_DRIVERS is not set # -# FireWire (IEEE 1394) Adapters +# Amlogic media platform drivers # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -# end of Media drivers # -# Media ancillary drivers +# Amphion drivers # -CONFIG_MEDIA_ATTACH=y # -# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# Aspeed media platform drivers # -CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_ASPEED=m # -# Audio decoders, processors and mixers +# Atmel media platform drivers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA1997X=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m -# end of Audio decoders, processors and mixers # -# RDS decoders +# Cadence media platform drivers # -CONFIG_VIDEO_SAA6588=m -# end of RDS decoders +# CONFIG_VIDEO_CADENCE_CSI2RX is not set +# CONFIG_VIDEO_CADENCE_CSI2TX is not set # -# Video decoders +# Chips&Media media platform drivers # -CONFIG_VIDEO_ADV7180=m -CONFIG_VIDEO_ADV7183=m -CONFIG_VIDEO_ADV748X=m -CONFIG_VIDEO_ADV7604=m -# CONFIG_VIDEO_ADV7604_CEC is not set -CONFIG_VIDEO_ADV7842=m -# CONFIG_VIDEO_ADV7842_CEC is not set -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_ML86V7667=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TC358743=m -# CONFIG_VIDEO_TC358743_CEC is not set -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TVP7002=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -CONFIG_VIDEO_TW9910=m -CONFIG_VIDEO_VPX3220=m -CONFIG_VIDEO_MAX9286=m # -# Video and audio decoders +# Intel media platform drivers # -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m -# end of Video decoders # -# Video encoders +# Marvell media platform drivers # -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -CONFIG_VIDEO_ADV7343=m -CONFIG_VIDEO_ADV7393=m -CONFIG_VIDEO_AD9389B=m -CONFIG_VIDEO_AK881X=m -CONFIG_VIDEO_THS8200=m -# end of Video encoders +CONFIG_VIDEO_CAFE_CCIC=m # -# Video improvement chips +# Mediatek media platform drivers # -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -# end of Video improvement chips # -# Audio/Video compression chips +# NVidia media platform drivers # -CONFIG_VIDEO_SAA6752HS=m -# end of Audio/Video compression chips # -# SDR tuner chips +# NXP media platform drivers # -CONFIG_SDR_MAX2175=m -# end of SDR tuner chips # -# Miscellaneous helper chips +# Qualcomm media platform drivers # -CONFIG_VIDEO_THS7303=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_I2C=m -CONFIG_VIDEO_ST_MIPID02=m -# end of Miscellaneous helper chips + +# +# Renesas media platform drivers +# + +# +# Rockchip media platform drivers +# + +# +# Samsung media platform drivers +# + +# +# STMicroelectronics media platform drivers +# + +# +# Sunxi media platform drivers +# + +# +# Texas Instruments drivers +# + +# +# VIA media platform drivers +# + +# +# Xilinx media platform drivers +# +CONFIG_VIDEO_XILINX=m +CONFIG_VIDEO_XILINX_CSI2RXSS=m +CONFIG_VIDEO_XILINX_TPG=m +CONFIG_VIDEO_XILINX_VTC=m + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +# CONFIG_DVB_TEST_DRIVERS is not set + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_TTPCI_EEPROM=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m # # Camera sensor devices @@ -6314,6 +6341,7 @@ CONFIG_VIDEO_ST_MIPID02=m CONFIG_VIDEO_APTINA_PLL=m # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set +# CONFIG_VIDEO_HI847 is not set # CONFIG_VIDEO_IMX208 is not set CONFIG_VIDEO_IMX214=m CONFIG_VIDEO_IMX219=m @@ -6325,7 +6353,22 @@ CONFIG_VIDEO_IMX319=m # CONFIG_VIDEO_IMX335 is not set CONFIG_VIDEO_IMX355=m # CONFIG_VIDEO_IMX412 is not set +CONFIG_VIDEO_MAX9271_LIB=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_NOON010PC30=m +# CONFIG_VIDEO_OG01A1B is not set # CONFIG_VIDEO_OV02A10 is not set +# CONFIG_VIDEO_OV08D10 is not set +CONFIG_VIDEO_OV13858=m +# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m @@ -6335,15 +6378,15 @@ CONFIG_VIDEO_OV5640=m CONFIG_VIDEO_OV5645=m CONFIG_VIDEO_OV5647=m # CONFIG_VIDEO_OV5648 is not set -CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m # CONFIG_VIDEO_OV5693 is not set CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m -CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV8856=m # CONFIG_VIDEO_OV8865 is not set @@ -6351,32 +6394,19 @@ CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9650=m # CONFIG_VIDEO_OV9734 is not set -CONFIG_VIDEO_OV13858=m -# CONFIG_VIDEO_OV13B10 is not set -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M001=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9M111=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9T112=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_MT9V111=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_RDACM20=m # CONFIG_VIDEO_RDACM21 is not set CONFIG_VIDEO_RJ54N1=m -CONFIG_VIDEO_S5K6AA=m -CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5C73M3=m CONFIG_VIDEO_S5K4ECGX=m CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VS6624=m # CONFIG_VIDEO_CCS is not set CONFIG_VIDEO_ET8EK8=m -CONFIG_VIDEO_S5C73M3=m +CONFIG_VIDEO_M5MOLS=m # end of Camera sensor devices # @@ -6398,15 +6428,116 @@ CONFIG_VIDEO_LM3646=m # end of Flash devices # -# SPI helper chips +# Audio decoders, processors and mixers # -CONFIG_VIDEO_GS1662=m -# end of SPI helper chips +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_SONY_BTF_MPX=m +CONFIG_VIDEO_TDA1997X=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_WM8775=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_ADV748X=m +CONFIG_VIDEO_ADV7604=m +# CONFIG_VIDEO_ADV7604_CEC is not set +CONFIG_VIDEO_ADV7842=m +# CONFIG_VIDEO_ADV7842_CEC is not set +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +# CONFIG_VIDEO_ISL7998X is not set +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_MAX9286=m +CONFIG_VIDEO_ML86V7667=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TC358743=m +# CONFIG_VIDEO_TC358743_CEC is not set +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_TW9910=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders + +# +# Video encoders +# +CONFIG_VIDEO_AD9389B=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_AK881X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_THS8200=m +# end of Video encoders + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +CONFIG_SDR_MAX2175=m +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_I2C=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_ST_MIPID02=m +CONFIG_VIDEO_THS7303=m +# end of Miscellaneous helper chips # # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m +CONFIG_VIDEO_GS1662=m # end of Media SPI Adapters CONFIG_MEDIA_TUNER=m @@ -6414,43 +6545,43 @@ CONFIG_MEDIA_TUNER=m # # Customize TV tuners # -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT20XX=m CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MXL301RF=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA8290=m +CONFIG_MEDIA_TUNER_TDA9887=m +CONFIG_MEDIA_TUNER_TEA5761=m +CONFIG_MEDIA_TUNER_TEA5767=m CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_XC5000=m # end of Customize TV tuners # @@ -6460,126 +6591,126 @@ CONFIG_MEDIA_TUNER_QM1D1B0004=m # # Multistandard (satellite) frontends # +CONFIG_DVB_M88DS3103=m +CONFIG_DVB_MXL5XX=m CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV0910=m CONFIG_DVB_STV6110x=m CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_TDA18271C2DD=m # # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m CONFIG_DVB_CX24123=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m +CONFIG_DVB_SI21XX=m CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0288=m CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_TDA10071=m CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP887X=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_AS102_FE=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -CONFIG_DVB_S5H1432=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m CONFIG_DVB_DIB9000=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m +CONFIG_DVB_DRXD=m CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_L64781=m +CONFIG_DVB_MT352=m +CONFIG_DVB_NXT6000=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m CONFIG_DVB_RTL2832_SDR=m +CONFIG_DVB_S5H1432=m CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_TDA1004X=m CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_ZL10353=m CONFIG_DVB_CXD2880=m # # DVB-C (cable) frontends # -CONFIG_DVB_VES1820=m +CONFIG_DVB_STV0297=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m +CONFIG_DVB_VES1820=m # # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LG2160=m CONFIG_DVB_LGDT3305=m CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_MXL692=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_OR51211=m CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_S5H1411=m -CONFIG_DVB_MXL692=m # # ISDB-T (terrestrial) frontends # -CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_S921=m # # ISDB-S (satellite) & ISDB-T (terrestrial) frontends # -CONFIG_DVB_TC90522=m CONFIG_DVB_MN88443X=m +CONFIG_DVB_TC90522=m # # Digital terrestrial only tuners/PLL @@ -6591,25 +6722,25 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBH29=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m +CONFIG_DVB_A8293=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_HELENE=m +CONFIG_DVB_HORUS3A=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m +CONFIG_DVB_IX2505V=m CONFIG_DVB_LGS8GL5=m CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBH29=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_DRX39XYJ=m # # Common Interface (EN50221) controller drivers @@ -6639,8 +6770,6 @@ CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m CONFIG_AGP_EFFICEON=m CONFIG_INTEL_GTT=m -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=m CONFIG_DRM_MIPI_DBI=m @@ -6648,6 +6777,7 @@ CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_DP_AUX_BUS=m CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DEBUG_SELFTEST=m +CONFIG_DRM_DP_HELPER=m CONFIG_DRM_KMS_HELPER=m # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6657,6 +6787,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m +CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_GEM_CMA_HELPER=m @@ -6790,6 +6921,7 @@ CONFIG_DRM_PANEL_LG_LB035Q02=m CONFIG_DRM_PANEL_LG_LG4573=m CONFIG_DRM_PANEL_NEC_NL8048HL11=m CONFIG_DRM_PANEL_NOVATEK_NT35510=m +# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set CONFIG_DRM_PANEL_NOVATEK_NT39016=m @@ -6822,7 +6954,6 @@ CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m CONFIG_DRM_PANEL_SITRONIX_ST7703=m CONFIG_DRM_PANEL_SITRONIX_ST7789V=m -CONFIG_DRM_PANEL_SONY_ACX424AKP=m CONFIG_DRM_PANEL_SONY_ACX565AKM=m # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set @@ -6846,6 +6977,7 @@ CONFIG_DRM_CDNS_DSI=m # CONFIG_DRM_CHRONTEL_CH7033 is not set # CONFIG_DRM_CROS_EC_ANX7688 is not set CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set @@ -6892,6 +7024,7 @@ CONFIG_DRM_ARCPGU=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GM12U320=m +# CONFIG_DRM_PANEL_MIPI_DBI is not set # CONFIG_DRM_SIMPLEDRM is not set CONFIG_TINYDRM_HX8357D=m # CONFIG_TINYDRM_ILI9163 is not set @@ -6904,6 +7037,7 @@ CONFIG_TINYDRM_ST7586=m CONFIG_TINYDRM_ST7735R=m CONFIG_DRM_VBOXVIDEO=m # CONFIG_DRM_GUD is not set +# CONFIG_DRM_SSD130X is not set # CONFIG_DRM_HYPERV is not set CONFIG_DRM_LEGACY=y CONFIG_DRM_TDFX=m @@ -7386,6 +7520,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m # CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +# CONFIG_SND_SOC_INTEL_AVS is not set CONFIG_SND_SOC_INTEL_MACH=y # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m @@ -7417,7 +7552,6 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_ACPI=m CONFIG_SND_SOC_SOF_OF=m -# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set # CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set @@ -7457,6 +7591,7 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_ALC5623=m +# CONFIG_SND_SOC_AW8738 is not set CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CPCAP=m @@ -7592,6 +7727,7 @@ CONFIG_SND_SOC_TAS2552=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TAS5720=m +# CONFIG_SND_SOC_TAS5805M is not set CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m CONFIG_SND_SOC_TFA9879=m @@ -7716,6 +7852,7 @@ CONFIG_HID_GFRM=m CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_VIVALDI_COMMON=m CONFIG_HID_GOOGLE_HAMMER=m # CONFIG_HID_VIVALDI is not set CONFIG_HID_GT683R=m @@ -7765,12 +7902,14 @@ CONFIG_HID_PICOLCD_LEDS=y CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m # CONFIG_HID_PLAYSTATION is not set +# CONFIG_HID_RAZER is not set CONFIG_HID_PRIMAX=m CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m # CONFIG_HID_SEMITEK is not set +# CONFIG_HID_SIGMAMICRO is not set CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m @@ -8209,8 +8348,10 @@ CONFIG_TYPEC_UCSI=m CONFIG_UCSI_CCG=m CONFIG_UCSI_ACPI=m CONFIG_TYPEC_TPS6598X=m +# CONFIG_TYPEC_RT1719 is not set # CONFIG_TYPEC_HD3SS3220 is not set # CONFIG_TYPEC_STUSB160X is not set +# CONFIG_TYPEC_WUSB3801 is not set # # USB Type-C Multiplexer/DeMultiplexer Switch support @@ -8727,9 +8868,11 @@ CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y +# CONFIG_MLX5_VFIO_PCI is not set CONFIG_VFIO_MDEV=m CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y +CONFIG_VMGENID=y CONFIG_VBOXGUEST=m # CONFIG_NITRO_ENCLAVES is not set CONFIG_VIRTIO=m @@ -8944,7 +9087,6 @@ CONFIG_ADIS16240=m # Analog to digital converters # CONFIG_AD7816=m -CONFIG_AD7280=m # end of Analog to digital converters # @@ -9000,18 +9142,11 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_SP8870=m - -# -# Android -# -# end of Android - CONFIG_STAGING_BOARD=y CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m CONFIG_FWTTY_MAX_TOTAL_PORTS=64 CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_GS_FPGABOOT=m CONFIG_UNISYSSPAR=y # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_FB_TFT is not set @@ -9077,7 +9212,6 @@ CONFIG_INTEL_ATOMISP2_PDX86=y CONFIG_INTEL_ATOMISP2_LED=m CONFIG_INTEL_ATOMISP2_PM=m # CONFIG_INTEL_SAR_INT1092 is not set -CONFIG_INTEL_CHT_INT33FE=m # CONFIG_INTEL_SKL_INT3472 is not set CONFIG_INTEL_PMC_CORE=y CONFIG_INTEL_WMI=y @@ -9088,6 +9222,7 @@ CONFIG_INTEL_VBTN=m CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_CHTDC_TI_PWRBTN=m +# CONFIG_INTEL_CHTWC_INT33FE is not set CONFIG_INTEL_PUNIT_IPC=m CONFIG_INTEL_RST=m CONFIG_INTEL_SMARTCONNECT=m @@ -9110,7 +9245,7 @@ CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y # CONFIG_SYSTEM76_ACPI is not set CONFIG_TOPSTAR_LAPTOP=m -CONFIG_I2C_MULTI_INSTANTIATE=m +# CONFIG_SERIAL_MULTI_INSTANTIATE is not set CONFIG_MLX_PLATFORM=m CONFIG_TOUCHSCREEN_DMI=y # CONFIG_X86_ANDROID_TABLETS is not set @@ -9139,6 +9274,7 @@ CONFIG_CROS_EC_SYSFS=m CONFIG_CROS_EC_TYPEC=m CONFIG_CROS_USBPD_LOGGER=m CONFIG_CROS_USBPD_NOTIFY=m +# CONFIG_CHROMEOS_PRIVACY_SCREEN is not set CONFIG_WILCO_EC=m CONFIG_WILCO_EC_DEBUGFS=m CONFIG_WILCO_EC_EVENTS=m @@ -9149,7 +9285,6 @@ CONFIG_MLXREG_IO=m # CONFIG_MLXREG_LC is not set CONFIG_SURFACE_PLATFORMS=y CONFIG_SURFACE3_WMI=m -CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m # CONFIG_SURFACE_GPE is not set # CONFIG_SURFACE_HOTPLUG is not set @@ -9171,12 +9306,12 @@ CONFIG_COMMON_CLK_SI570=m CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_CDCE925=m CONFIG_COMMON_CLK_CS2000_CP=m -# CONFIG_COMMON_CLK_LAN966X is not set CONFIG_COMMON_CLK_S2MPS11=m CONFIG_CLK_TWL6040=m # CONFIG_COMMON_CLK_AXI_CLKGEN is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_VC5=m CONFIG_COMMON_CLK_BD718XX=m # CONFIG_COMMON_CLK_FIXED_MMIO is not set @@ -9234,6 +9369,7 @@ CONFIG_HYPERV_IOMMU=y # CONFIG_RPMSG=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG_NS=m CONFIG_RPMSG_QCOM_GLINK=m CONFIG_RPMSG_QCOM_GLINK_RPM=m @@ -9357,6 +9493,8 @@ CONFIG_ADIS16209=m # CONFIG_ADXL313_SPI is not set # CONFIG_ADXL355_I2C is not set # CONFIG_ADXL355_SPI is not set +# CONFIG_ADXL367_SPI is not set +# CONFIG_ADXL367_I2C is not set CONFIG_ADXL372=m CONFIG_ADXL372_SPI=m CONFIG_ADXL372_I2C=m @@ -9409,6 +9547,7 @@ CONFIG_AD7091R5=m CONFIG_AD7124=m CONFIG_AD7192=m CONFIG_AD7266=m +CONFIG_AD7280=m CONFIG_AD7291=m # CONFIG_AD7292 is not set CONFIG_AD7298=m @@ -9499,6 +9638,7 @@ CONFIG_IIO_RESCALE=m # Amplifiers # CONFIG_AD8366=m +# CONFIG_ADA4250 is not set CONFIG_HMC425=m # end of Amplifiers @@ -9575,6 +9715,7 @@ CONFIG_AD5592R=m CONFIG_AD5593R=m CONFIG_AD5504=m CONFIG_AD5624R_SPI=m +# CONFIG_LTC2688 is not set CONFIG_AD5686=m CONFIG_AD5686_SPI=m CONFIG_AD5696_I2C=m @@ -9631,6 +9772,7 @@ CONFIG_AD9523=m CONFIG_ADF4350=m CONFIG_ADF4371=m # CONFIG_ADMV1013 is not set +# CONFIG_ADMV4420 is not set # CONFIG_ADRF6780 is not set # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -9900,6 +10042,8 @@ CONFIG_PING=m CONFIG_RFD77402=m CONFIG_SRF04=m # CONFIG_SX9310 is not set +# CONFIG_SX9324 is not set +# CONFIG_SX9360 is not set CONFIG_SX9500=m CONFIG_SRF08=m # CONFIG_VCNL3020 is not set @@ -10008,11 +10152,9 @@ CONFIG_BCM_KONA_USB2_PHY=m CONFIG_PHY_CADENCE_TORRENT=m CONFIG_PHY_CADENCE_DPHY=m +# CONFIG_PHY_CADENCE_DPHY_RX is not set CONFIG_PHY_CADENCE_SIERRA=m # CONFIG_PHY_CADENCE_SALVO is not set -CONFIG_PHY_FSL_IMX8MQ_USB=m -CONFIG_PHY_MIXEL_MIPI_DPHY=m -# CONFIG_PHY_FSL_IMX8M_PCIE is not set CONFIG_PHY_PXA_28NM_HSIC=m CONFIG_PHY_PXA_28NM_USB2=m # CONFIG_PHY_LAN966X_SERDES is not set @@ -10143,6 +10285,7 @@ CONFIG_MOST=m CONFIG_MOST_USB_HDM=m CONFIG_MOST_CDEV=m # CONFIG_MOST_SND is not set +# CONFIG_PECI is not set # end of Device Drivers # @@ -10206,8 +10349,8 @@ CONFIG_F2FS_CHECK_FS=y # CONFIG_F2FS_FAULT_INJECTION is not set # CONFIG_F2FS_FS_COMPRESSION is not set CONFIG_F2FS_IOSTAT=y +# CONFIG_F2FS_UNFAIR_RWSEM is not set CONFIG_ZONEFS_FS=m -CONFIG_FS_DAX=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y @@ -10233,7 +10376,6 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m -CONFIG_FUSE_DAX=y CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS_REDIRECT_DIR=y # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set @@ -10416,7 +10558,6 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -10532,19 +10673,18 @@ CONFIG_KEYS=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m +# CONFIG_USER_DECRYPTED_DATA is not set CONFIG_KEY_DH_OPERATIONS=y # CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SMACK is not set @@ -10627,6 +10767,7 @@ CONFIG_CRYPTO_ENGINE=m # CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y +# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m # CONFIG_CRYPTO_ECDSA is not set @@ -10680,6 +10821,7 @@ CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m @@ -10779,10 +10921,8 @@ CONFIG_CRYPTO_DEV_CCREE=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS8_PRIVATE_KEY_PARSER=m -CONFIG_TPM_KEY_PARSER=m CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y @@ -10836,12 +10976,15 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -10849,7 +10992,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m @@ -10986,10 +11129,16 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + # # Compile-time checks and compiler options # -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_INFO_NONE=y +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_DWARF5 is not set CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set @@ -11019,9 +11168,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MISC=y - # # Networking Debugging # @@ -11154,6 +11300,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_LATENCYTOP=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_RETHOOK=y +CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -11180,6 +11328,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +# CONFIG_FPROBE is not set CONFIG_FUNCTION_PROFILER=y CONFIG_STACK_TRACER=y # CONFIG_IRQSOFF_TRACER is not set @@ -11283,7 +11432,6 @@ CONFIG_TEST_STRSCPY=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set CONFIG_TEST_XARRAY=m -CONFIG_TEST_OVERFLOW=m # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SIPHASH is not set CONFIG_TEST_IDA=m @@ -11302,7 +11450,6 @@ CONFIG_TEST_BLACKHOLE_DEV=m # CONFIG_TEST_KMOD is not set CONFIG_TEST_MEMCAT_P=m CONFIG_TEST_OBJAGG=m -CONFIG_TEST_STACKINIT=m CONFIG_TEST_MEMINIT=m CONFIG_TEST_FREE_PAGES=m CONFIG_TEST_FPU=m From fe84eb3504cfb10b7e06186738a5a80be5409742 Mon Sep 17 00:00:00 2001 From: David P Date: Jul 28 2022 02:51:35 +0000 Subject: [PATCH 40/200] updpkg: libre/linux-libre-hardened 5.18.12.hardened1-1 Signed-off-by: David P --- diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD index 957ead8..3b49f05 100644 --- a/libre/linux-libre-hardened/PKGBUILD +++ b/libre/linux-libre-hardened/PKGBUILD @@ -9,7 +9,7 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre-hardened -pkgver=5.18.5.hardened1 +pkgver=5.18.12.hardened1 pkgrel=1 pkgdesc='Security-Hardened Linux-libre' url='https://linux-libre.fsfla.org/' @@ -27,7 +27,6 @@ source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign} "https://github.com/anthraxx/linux-hardened/releases/download/${_srctag}/linux-hardened-${_srctag}.patch"{,.sig} "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} - ALSA-memalloc-Drop-x86-specific-hack-for-WC-allocations.patch::https://lore.kernel.org/all/87bkur1nil.wl-tiwai@suse.de/raw config # the main kernel config file # maintain the TTY over USB disconnects @@ -46,9 +45,9 @@ validpgpkeys=( ) sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' 'SKIP' - '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06' + '8093255d5508830de397707ad492cdb90c205d8a2eebb3f9b5a2eb32a51493dbfaf27f8fb546faa1bee41b3632c635e9e24b702f54ad4a28ebb10c0b4a7cb196' 'SKIP' - 'f871eb1e68a382e183951f8e3ddc59b7cf09ddc44e1506282404dc2de11885dca6e21ef998d16cb1b3dd829e0da9096b0d02524939e7290591b52695879f6e0d' + '1bd6ae6b24bdabe56c37cc6fac7c6d43bcb2c62acaa8b80710482a94251528e91f6c85ab177f7a49fb7c3e591c64cc2976312e1ba9cd37c6139bd4f44ef1d53e' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -56,8 +55,7 @@ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbeb 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - 'd52c195b0d2ca63238e61f019b392840ad6c163223897e781056f5ac4f78eb8587bed30494729b54329313da525fd4f605b367da420c4a2ef1aaaa1aef5efdbb' - '903228a7ddb6b504a91125e1af2d89ef3264803731cdd1bc16adab809ac39a42b99c14e360b912cbcc8a61c02a02c5b589aa37d1a8d611adb8c488f4dd1a5fd4' + 'db147db1f15f82a365275e9042a47617bb32d4bf9c25575d1151d478a90668b604c26ab415c5438c11a32777d2f63f7fc63ab9d61148b13751470a9971223896' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') @@ -108,8 +106,7 @@ prepare() { build() { cd $_srcname - make all - make htmldocs + make htmldocs all } _package() { diff --git a/libre/linux-libre-hardened/config b/libre/linux-libre-hardened/config index 2ffff25..f5d80bb 100644 --- a/libre/linux-libre-hardened/config +++ b/libre/linux-libre-hardened/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.18.5-gnu-hardened1 Kernel Configuration +# Linux/x86 5.18.12-gnu-hardened1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -194,6 +194,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -10314,6 +10316,7 @@ CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y From 93b15ea32574b075905d3998f127d12a88c76e83 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Jul 29 2022 14:24:16 +0000 Subject: [PATCH 41/200] pcr: remove lcov On armv7h, and x86_64 we have: community/lcov 1.16-1 front-end for GCC’s coverage testing tool gcov and on i686 we have: community/lcov 1.16-1.0 front-end for GCC’s coverage testing tool gcov Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/lcov/PKGBUILD b/pcr/lcov/PKGBUILD deleted file mode 100644 index d9a20b7..0000000 --- a/pcr/lcov/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Luke Shumaker -# Contributor (AUR): Jordi De Groof -# Contributor (AUR): Andre Klitzing - -pkgname=lcov -pkgver=1.13 -pkgrel=2 -pkgdesc="front-end for GCC's coverage testing tool gcov" -arch=('any') -url="http://ltp.sourceforge.net/coverage/lcov.php" -license=('GPL') -depends=('perl') -source=("http://downloads.sourceforge.net/ltp/$pkgname-$pkgver.tar.gz" - "handle-equals-signs.patch" - "fix-undef-behaviour.patch" - ) - -prepare() -{ - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i $srcdir/handle-equals-signs.patch - patch -p1 -i $srcdir/fix-undef-behaviour.patch -} - - -package() -{ - cd "$srcdir/$pkgname-$pkgver" - - make PREFIX="$pkgdir/usr" install -} - -sha256sums=('44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23' - '54728aa4e244d3662c65ba91fb486dc1d5c64d9d55745ee334c4131109dc233c' - 'ceaf41f7cc9cea5a6fc4b0385ffef10d1ab8812acd2a5b16dcd8d7bca7120488') diff --git a/pcr/lcov/fix-undef-behaviour.patch b/pcr/lcov/fix-undef-behaviour.patch deleted file mode 100644 index 3621fc8..0000000 --- a/pcr/lcov/fix-undef-behaviour.patch +++ /dev/null @@ -1,37 +0,0 @@ -Author: Alastair McKinstry -Description: Fix for undefined behavior in perl5.20 -Origin: http://bugs.debian.org/761308 -Forwarded: no -Last-Updated: 2014-09-13 - -Index: lcov-1.12/bin/lcov -=================================================================== ---- lcov-1.12.orig/bin/lcov -+++ lcov-1.12/bin/lcov -@@ -224,7 +224,9 @@ Getopt::Long::Configure("default"); - # Remove spaces around rc options - my %new_opt_rc; - -- while (my ($key, $value) = each(%opt_rc)) { -+ my @keys = keys %opt_rc; -+ for my $key (@keys) { -+ my $value = $opt_rc{$key}; - $key =~ s/^\s+|\s+$//g; - $value =~ s/^\s+|\s+$//g; - -Index: lcov-1.12/bin/geninfo -=================================================================== ---- lcov-1.12.orig/bin/geninfo -+++ lcov-1.12/bin/geninfo -@@ -284,8 +284,9 @@ Getopt::Long::Configure("default"); - { - # Remove spaces around rc options - my %new_opt_rc; -- -- while (my ($key, $value) = each(%opt_rc)) { -+ my @keys = keys %opt_rc; -+ for my $key (@keys) { -+ my $value = $opt_rc{$key}; - $key =~ s/^\s+|\s+$//g; - $value =~ s/^\s+|\s+$//g; - diff --git a/pcr/lcov/handle-equals-signs.patch b/pcr/lcov/handle-equals-signs.patch deleted file mode 100644 index 8ab0998..0000000 --- a/pcr/lcov/handle-equals-signs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Handle "=====" as another form of zero. - gcov prints "=====" instead of "######" when an unexecuted line is - "reachable only by exceptional paths such as C++ exception handlers." - This should be handled the same as "######" for our purposes. -Author: Zack Weinberg -Last-Update: 2013-02-01 - -Index: lcov-1.12/bin/geninfo -=================================================================== ---- lcov-1.12.orig/bin/geninfo -+++ lcov-1.12/bin/geninfo -@@ -1771,8 +1771,9 @@ sub read_gcov_file($) - $number = (split(" ",substr($_, 0, 16)))[0]; - - # Check for zero count which is indicated -- # by ###### -- if ($number eq "######") { $number = 0; } -+ # by ###### or ===== -+ if ($number eq "######" or -+ $number eq "=====") { $number = 0; } - - if ($exclude_line) { - # Register uninstrumented line instead From 026b52139af4f5f677a04b86412492a722e18132 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jul 30 2022 07:34:49 +0000 Subject: [PATCH 42/200] [rtl8812au]: add package v5.6.4.2.20220606 --- diff --git a/pcr/rtl8812au/PKGBUILD b/pcr/rtl8812au/PKGBUILD new file mode 100644 index 0000000..b4e6141 --- /dev/null +++ b/pcr/rtl8812au/PKGBUILD @@ -0,0 +1,85 @@ +# Maintainer: Parabola Hackers + + +_pkgbase=rtl8812au +pkgname=rtl8812au-dkms +pkgver=5.6.4.2.20220606 # per upstream dkms.conf (see note in prepare()) +_cid=cab4e4ec56884f65e0c279c1b5ceaf70dbe79be0 +pkgrel=3 +pkgdesc="RTL8812AU/21AU and RTL8814AU driver with monitor mode and frame injection" +url=https://github.com/aircrack-ng/rtl8812au +license=(GPL2) +arch=(armv7h i686 x86_64) + +makedepends=() +depends=(dkms) + +source=(${_pkgbase}-${pkgver}.tar.gz::https://github.com/aircrack-ng/rtl8812au/archive/${_cid}.tar.gz + dkms.conf) + +sha256sums=(20b498bc597e5343ee6c240eabd45c36894db86c76f6bfc100448c8b9c420733 + 9f7c983df45db1938ee924b2dac8e8d98becef78822536b6c8f489a56a25c6a4) + +case "${CARCH}" in +armv7h ) export KARCH=arm ;; +aarch64) export KARCH=arm64 ;; # TODO: not yet supported +esac + + +prepare() +{ + cd "${srcdir}"/${_pkgbase}-${_cid} + + # version sanity check + # NOTE: The upstream does not publich versioned releases, nor use git tags. + # However they are kind enough to version the dkms.conf. + # eg: PACKAGE_VERSION="5.6.4.2~20220715" + # This PKGBUILD attempts to version the package properly, based on + # that version ID (aka: pkgver) and the VCS commit (aka: _cid) which defined it. + local upstream_ver=$(grep PACKAGE_VERSION= dkms.conf | sed 's|PACKAGE_VERSION="\(.*\)"|\1|') + [[ "${upstream_ver/\~/.}" == ${pkgver} ]] || ! echo "version mismatch in dkms.conf" || return 1 + + # we will use our dkms.conf though + cp "${srcdir}"/dkms.conf . + + case "${CARCH}" in + armv7h) + sed -i 's|^CONFIG_PLATFORM_I386_PC = y|CONFIG_PLATFORM_I386_PC = n|' Makefile + sed -i 's|^CONFIG_PLATFORM_ARM_SUN7I = n|CONFIG_PLATFORM_ARM_SUN7I = y|' Makefile + sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |" dkms.conf + ;; + aarch64) + sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |" dkms.conf + ;; + esac + sed -i -e "s/@PKGBASE@/${_pkgbase}/" -e "s/@PKGVER@/${pkgver}/" dkms.conf + + # cleanup some sources that we won't need + # the licensing of files under the tools/ directory is varied and unclear + # TODO: this could/should go into a mksource() function + rm -rf android/ tools/ +} + +package() +{ + cd "${srcdir}"/${_pkgbase}-${_cid} + + local dkms_srcdir="${pkgdir}"/usr/src/${_pkgbase}-${pkgver} + + # Install + # Makefile does not respect DESTDIR + # make DESTDIR="${pkgdir}" install + + # Copy dkms.conf + install -Dm644 dkms.conf "${dkms_srcdir}"/dkms.conf + + # Set name and version + # already did that + + # Copy sources (including Makefile) + cp -r ./* "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/ + + # install docs + install -Dm644 README.md "${pkgdir}"/usr/share/doc/${_pkgbase}/README.md + install -m644 docs/* "${pkgdir}"/usr/share/doc/${_pkgbase}/ +} diff --git a/pcr/rtl8812au/dkms.conf b/pcr/rtl8812au/dkms.conf new file mode 100644 index 0000000..e996e64 --- /dev/null +++ b/pcr/rtl8812au/dkms.conf @@ -0,0 +1,9 @@ +PACKAGE_NAME="@PKGBASE@" +PACKAGE_VERSION="@PKGVER@" +BUILT_MODULE_NAME="88XXau" +PROCS_NUM=$(nproc) +[ $PROCS_NUM -gt 16 ] && PROCS_NUM=16 +MAKE="'make' -j$PROCS_NUM KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build" +CLEAN="'make' clean" +DEST_MODULE_LOCATION="/kernel/drivers/net/wireless" +AUTOINSTALL="yes" From 93be04daa5376c88de01570a0bbacc6525c65951 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jul 30 2022 07:35:00 +0000 Subject: [PATCH 43/200] [gophernicus]: move to [pcr] --- diff --git a/pcr-testing/gophernicus/PKGBUILD b/pcr-testing/gophernicus/PKGBUILD deleted file mode 100644 index d01c741..0000000 --- a/pcr-testing/gophernicus/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: botplus -# Contributor: bill-auger - - -pkgname=gophernicus -pkgver=3.1.1 -pkgrel=2 -pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon" -arch=('armv7h' 'i686' 'x86_64') -url="https://github.com/gophernicus/gophernicus" -license=('BSD2') - -backup=(etc/xinetd.d/gophernicus - srv/gopher/gophermap) -install=${pkgname}.install - -depends=('libwrap' 'xinetd') -optdepends=("xinetd-openrc: openrc init-script") -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz - xinetd-respect-custom-server-root.patch - remove-DESTDIR-from-initscripts.patch - fix-make-log-typo.patch - preserve-existing-gophermap.patch) - -b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb' - 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280' - '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468' - '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c' - 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4') - - -prepare() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - # allow server root under /srv/ with xinetd - patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch - - # remove DESTDIR path from installed init scripts - patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch - - # fix typo in make log (does not affect the binary package) - patch -Np1 < "${srcdir}"/fix-make-log-typo.patch - - # fix think-o in ./configure (does not affect the binary package) - patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch -} - -build() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --listener=xinetd \ - --gopherroot=/srv/gopher - make -} - -package() -{ - cd "${srcdir}"/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install -} diff --git a/pcr-testing/gophernicus/fix-make-log-typo.patch b/pcr-testing/gophernicus/fix-make-log-typo.patch deleted file mode 100644 index 4cf75dd..0000000 --- a/pcr-testing/gophernicus/fix-make-log-typo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 3ab1bd1..5468d92 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -109,7 +109,7 @@ install-msg-xinetd: - echo "accessed." - echo "On systemd distributions:" - echo " systemctl restart xinetd" -- echo "You can configure arguments, including the hostname, in $(INETD)." -+ echo "You can configure arguments, including the hostname, in $(XINETD)." - echo - - install-msg-systemd: diff --git a/pcr-testing/gophernicus/gophernicus.install b/pcr-testing/gophernicus/gophernicus.install deleted file mode 100644 index ad4be45..0000000 --- a/pcr-testing/gophernicus/gophernicus.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - echo "==> to start the gophernicus service:" - echo " systemd:" - echo " # systemctl start xinetd.service" - echo " openrc:" - echo " # rc-service xinetd start" - echo "==> configuration is:" - echo " /etc/xinetd.d/gophernicus" - echo "==> server root is:" - echo " /srv/gopher" -} diff --git a/pcr-testing/gophernicus/preserve-existing-gophermap.patch b/pcr-testing/gophernicus/preserve-existing-gophermap.patch deleted file mode 100644 index 5443391..0000000 --- a/pcr-testing/gophernicus/preserve-existing-gophermap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure b/configure -index d54dc29..067affe 100755 ---- a/configure -+++ b/configure -@@ -280,9 +280,9 @@ printf "\\n" - # Don't replace an existing root - printf "checking for existing gopher root... " - if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then -- INSTALL_ROOT="install-root" - printf "yes" - else -+ INSTALL_ROOT="install-root" - printf "no" - fi - printf "\\n" diff --git a/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch deleted file mode 100644 index 96eec6d..0000000 --- a/pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5468d92..d047c7a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -145,15 +145,15 @@ install-root: - $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap - - install-inetd-update: install-root -- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" -+ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" - update-inetd --enable gopher - - install-inetd-manual: install-root -- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) -+ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) - - install-xinetd: install-root - $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d -- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd -+ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd - $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD) - - install-osx: install-root -@@ -172,7 +172,7 @@ install-systemd: install-root - $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME) - $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD) - $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket -- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service -+ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service - $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service - - uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@ diff --git a/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch b/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch deleted file mode 100644 index b010663..0000000 --- a/pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/configure b/configure -index 067affe..c78a9f6 100755 ---- a/configure -+++ b/configure -@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile - - printf "done\\n" - --# Also sub in $HOSTNAME to the various init systems (whether or not we really --# use them, its just easier) -+# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems -+# (whether or not we really use them, its just easier) - for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ - gophernicus.xinetd; do - printf "creating init/${f}... " -- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" -+ cp init/${f}{.in,} -+ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} -+ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} - printf "done\\n" - done - -diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in -index 4f2c921..a052375 100644 ---- a/init/gophernicus.xinetd.in -+++ b/init/gophernicus.xinetd.in -@@ -6,6 +6,6 @@ service gopher - wait = no - user = nobody - server = @BINARY@ -- server_args = -r/var/gopher -h@HOSTNAME@ -+ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ - disable = no - } diff --git a/pcr/gophernicus/PKGBUILD b/pcr/gophernicus/PKGBUILD new file mode 100644 index 0000000..d01c741 --- /dev/null +++ b/pcr/gophernicus/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: botplus +# Contributor: bill-auger + + +pkgname=gophernicus +pkgver=3.1.1 +pkgrel=2 +pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon" +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/gophernicus/gophernicus" +license=('BSD2') + +backup=(etc/xinetd.d/gophernicus + srv/gopher/gophermap) +install=${pkgname}.install + +depends=('libwrap' 'xinetd') +optdepends=("xinetd-openrc: openrc init-script") +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz + xinetd-respect-custom-server-root.patch + remove-DESTDIR-from-initscripts.patch + fix-make-log-typo.patch + preserve-existing-gophermap.patch) + +b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb' + 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280' + '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468' + '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c' + 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4') + + +prepare() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + # allow server root under /srv/ with xinetd + patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch + + # remove DESTDIR path from installed init scripts + patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch + + # fix typo in make log (does not affect the binary package) + patch -Np1 < "${srcdir}"/fix-make-log-typo.patch + + # fix think-o in ./configure (does not affect the binary package) + patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch +} + +build() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --listener=xinetd \ + --gopherroot=/srv/gopher + make +} + +package() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gophernicus/fix-make-log-typo.patch b/pcr/gophernicus/fix-make-log-typo.patch new file mode 100644 index 0000000..4cf75dd --- /dev/null +++ b/pcr/gophernicus/fix-make-log-typo.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 3ab1bd1..5468d92 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -109,7 +109,7 @@ install-msg-xinetd: + echo "accessed." + echo "On systemd distributions:" + echo " systemctl restart xinetd" +- echo "You can configure arguments, including the hostname, in $(INETD)." ++ echo "You can configure arguments, including the hostname, in $(XINETD)." + echo + + install-msg-systemd: diff --git a/pcr/gophernicus/gophernicus.install b/pcr/gophernicus/gophernicus.install new file mode 100644 index 0000000..ad4be45 --- /dev/null +++ b/pcr/gophernicus/gophernicus.install @@ -0,0 +1,11 @@ +post_install() { + echo "==> to start the gophernicus service:" + echo " systemd:" + echo " # systemctl start xinetd.service" + echo " openrc:" + echo " # rc-service xinetd start" + echo "==> configuration is:" + echo " /etc/xinetd.d/gophernicus" + echo "==> server root is:" + echo " /srv/gopher" +} diff --git a/pcr/gophernicus/preserve-existing-gophermap.patch b/pcr/gophernicus/preserve-existing-gophermap.patch new file mode 100644 index 0000000..5443391 --- /dev/null +++ b/pcr/gophernicus/preserve-existing-gophermap.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index d54dc29..067affe 100755 +--- a/configure ++++ b/configure +@@ -280,9 +280,9 @@ printf "\\n" + # Don't replace an existing root + printf "checking for existing gopher root... " + if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then +- INSTALL_ROOT="install-root" + printf "yes" + else ++ INSTALL_ROOT="install-root" + printf "no" + fi + printf "\\n" diff --git a/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch new file mode 100644 index 0000000..96eec6d --- /dev/null +++ b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile.in b/Makefile.in +index 5468d92..d047c7a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -145,15 +145,15 @@ install-root: + $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap + + install-inetd-update: install-root +- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" ++ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" + update-inetd --enable gopher + + install-inetd-manual: install-root +- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) ++ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) + + install-xinetd: install-root + $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd + $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD) + + install-osx: install-root +@@ -172,7 +172,7 @@ install-systemd: install-root + $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME) + $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD) + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service + + uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@ diff --git a/pcr/gophernicus/xinetd-respect-custom-server-root.patch b/pcr/gophernicus/xinetd-respect-custom-server-root.patch new file mode 100644 index 0000000..b010663 --- /dev/null +++ b/pcr/gophernicus/xinetd-respect-custom-server-root.patch @@ -0,0 +1,34 @@ +diff --git a/configure b/configure +index 067affe..c78a9f6 100755 +--- a/configure ++++ b/configure +@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile + + printf "done\\n" + +-# Also sub in $HOSTNAME to the various init systems (whether or not we really +-# use them, its just easier) ++# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems ++# (whether or not we really use them, its just easier) + for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ + gophernicus.xinetd; do + printf "creating init/${f}... " +- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" ++ cp init/${f}{.in,} ++ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} ++ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} + printf "done\\n" + done + +diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in +index 4f2c921..a052375 100644 +--- a/init/gophernicus.xinetd.in ++++ b/init/gophernicus.xinetd.in +@@ -6,6 +6,6 @@ service gopher + wait = no + user = nobody + server = @BINARY@ +- server_args = -r/var/gopher -h@HOSTNAME@ ++ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ + disable = no + } From db990c173ddf0c64428a8ce4c212ed1c9537c9c9 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Jul 30 2022 07:35:03 +0000 Subject: [PATCH 44/200] [pacman]: remove keyring update service files the keyring network is in a sad shape these days --refresh-keys does more harm than good --- diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index ae5d4e9..aab8eff 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -10,7 +10,6 @@ # parabola changes and rationale: # - adapt config files to support multiple arches -# - install keyring updater service files # - allow pacstrap to create cross-arch chroots @@ -171,18 +170,4 @@ package() { install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/" done - - # systemd service - install -dm755 "$pkgdir/usr/lib/systemd/system" - install -dm755 "$pkgdir/usr/lib/systemd/system-preset" - install -m644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/" - install -m644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/" - install -m644 /dev/stdin "$pkgdir/usr/lib/systemd/system-preset/90-pacman.preset" \ - <<<"enable pacman-keyring.timer" - - # openrc service - install -dm755 "$pkgdir/etc/init.d" - install -dm755 "$pkgdir/etc/runlevels/default" - install -m755 "$srcdir/pacman-keyring.initd" "$pkgdir/etc/init.d/pacman-keyring" - ln -s /etc/init.d/pacman-keyring "$pkgdir/etc/runlevels/default/pacman-keyring" } diff --git a/libre/pacman/dummy.conf b/libre/pacman/dummy.conf index 8d7df06..1b42f4b 100644 --- a/libre/pacman/dummy.conf +++ b/libre/pacman/dummy.conf @@ -1 +1,2 @@ -# parabola's pacman.conf expects at least 1 file matching /etc/pacman.d/*.conf +# if the '# Over-rides #' include in pacman.conf is enabled, +# there must exist at least 1 file matching /etc/pacman.d/*.conf diff --git a/libre/pacman/pacman-keyring.initd b/libre/pacman/pacman-keyring.initd deleted file mode 100644 index 1945af5..0000000 --- a/libre/pacman/pacman-keyring.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run - -# This is not a daemon; but a short-lived process, -# which only needs to run occasionally. -# Running it as a pseudo-service, -# simplifies the install (rather than requiring a cron deamon). -# Users must only add it to the 'default' runlevel. - - -name="pacman-keyring" -description="Refresh pacman keyring" - - -depend() { - need net - after logger -} - -# Custom start() function with wrapper, to always exit "success" status. -# The command will exit non-zero upon any failed key retrieval; -# which is common if not likely, due to the large number of keys it fetches. -start() { - ebegin "Starting ${RC_SVCNAME}" - start-stop-daemon --start --exec /usr/bin/bash -- -c '/usr/bin/pacman-key --refresh-keys || :' - eend $? -} diff --git a/libre/pacman/pacman-keyring.service b/libre/pacman/pacman-keyring.service deleted file mode 100644 index ded0235..0000000 --- a/libre/pacman/pacman-keyring.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Refresh pacman keyring -Documentation=man:pacman-key - -[Service] -Type=oneshot -ExecStart=/usr/bin/pacman-key --refresh-keys diff --git a/libre/pacman/pacman-keyring.timer b/libre/pacman/pacman-keyring.timer deleted file mode 100644 index 1b54d44..0000000 --- a/libre/pacman/pacman-keyring.timer +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Refresh pacman keyring once a week -Documentation=man:pacman-key - -[Timer] -OnCalendar=weekly -AccuracySec=1h -Persistent=true - -[Install] -WantedBy=timers.target From 2cc6dd417f73b30e11e1e3dd0e5817471f009f28 Mon Sep 17 00:00:00 2001 From: David P Date: Aug 01 2022 23:53:09 +0000 Subject: [PATCH 45/200] updpkg: libre/linux-libre-pck 5.18.14.pck1-1 Signed-off-by: David P --- diff --git a/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch new file mode 100644 index 0000000..a6967e0 --- /dev/null +++ b/libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -0,0 +1,51 @@ +From cf30569da906ee631341244693ab1affde38809d Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:59:28 +0100 +Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot + +Marvell uses a specific atag in its u-boot which includes among other +information the MAC addresses for up to 4 network interfaces. + +Signed-off-by: Willy Tarreau +--- + arch/arm/include/uapi/asm/setup.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h +index 25ceda63b284..83578c54975b 100644 +--- a/arch/arm/include/uapi/asm/setup.h ++++ b/arch/arm/include/uapi/asm/setup.h +@@ -144,6 +144,18 @@ struct tag_memclk { + __u32 fmemclk; + }; + ++/* Marvell uboot parameters */ ++#define ATAG_MV_UBOOT 0x41000403 ++struct tag_mv_uboot { ++ __u32 uboot_version; ++ __u32 tclk; ++ __u32 sysclk; ++ __u32 isUsbHost; ++ __u8 macAddr[4][6]; ++ __u16 mtu[4]; ++ __u32 nand_ecc; ++}; ++ + struct tag { + struct tag_header hdr; + union { +@@ -166,6 +178,11 @@ struct tag { + * DC21285 specific + */ + struct tag_memclk memclk; ++ ++ /* ++ * Marvell specific ++ */ ++ struct tag_mv_uboot mv_uboot; + } u; + }; + +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch new file mode 100644 index 0000000..e9de435 --- /dev/null +++ b/libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch @@ -0,0 +1,39 @@ +From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= +Date: Mon, 26 Aug 2013 19:19:44 +0300 +Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We may want to maintain the TTY over USB disconnects. + +This is useful when we have a terminal console to a host which +power-cycles or for other reasons resets the USB host controller. + +Signed-off-by: Kyösti Mälkki +--- + drivers/usb/gadget/function/u_serial.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c +index b369292..d156a28 100644 +--- a/drivers/usb/gadget/function/u_serial.c ++++ b/drivers/usb/gadget/function/u_serial.c +@@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser) + gser->ioport = NULL; + if (port->port.count > 0 || port->openclose) { + wake_up_interruptible(&port->drain_wait); ++#if 0 + if (port->port.tty) + tty_hangup(port->port.tty); ++#else ++ if (port->port.tty) ++ stop_tty(port->port.tty); ++#endif + } + spin_unlock_irqrestore(&port->port_lock, flags); + +-- +1.8.1.1 + diff --git a/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch new file mode 100644 index 0000000..c822087 --- /dev/null +++ b/libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -0,0 +1,38 @@ +From 9f2269dc32ec1f583bba94432ca17dcef3778677 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Sun, 2 Dec 2012 19:56:58 +0100 +Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot + loader + +The atags are parsed and if a Marvell atag is found, up to 4 MAC +addresses are extracted there and assigned to node aliases eth0..3 +with the name "mac-address". + +This was tested on my Mirabox and the two NICs had their correct +address set. + +Signed-off-by: Willy Tarreau +--- + arch/arm/boot/compressed/atags_to_fdt.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c +index 1feb6b0f7a1f..5e5cb3094b6a 100644 +--- a/arch/arm/boot/compressed/atags_to_fdt.c ++++ b/arch/arm/boot/compressed/atags_to_fdt.c +@@ -205,6 +205,12 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) + hex_str(serno, atag->u.serialnr.high); + hex_str(serno+8, atag->u.serialnr.low); + setprop_string(fdt, "/", "serial-number", serno); ++ } else if (atag->hdr.tag == ATAG_MV_UBOOT) { ++ /* This ATAG provides up to 4 MAC addresses */ ++ setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6); ++ setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6); ++ setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6); ++ setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6); + } + } + +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch new file mode 100644 index 0000000..5ad26fc --- /dev/null +++ b/libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch @@ -0,0 +1,37 @@ +From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001 +From: André Silva +Date: Tue, 22 Mar 2016 17:58:59 -0300 +Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support + +The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu, +but not with the current longterm and mainline kernels in +Parabola. + +Now it needs to load nonfree firmware in mxt_initialize(), +which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the +atmel_mxt_ts driver fails to work. + +This driver works if changing reject_firmware_nowait to +request_firmware_nowait in atmel_mxt_ts.c. This line is +requesting the file named MXT_CFG_NAME, and it's a config file, +not the firmware blob. + +Signed-off-by: André Silva +Signed-off-by: mytbk +--- + drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c +index 726a83e..d818834 100644 +--- a/drivers/input/touchscreen/atmel_mxt_ts.c ++++ b/drivers/input/touchscreen/atmel_mxt_ts.c +@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data) + if (error) + goto err_free_object_table; + +- error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, ++ error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME, + &client->dev, GFP_KERNEL, data, + mxt_config_cb); + if (error) { diff --git a/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch b/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch new file mode 100644 index 0000000..a494c2d --- /dev/null +++ b/libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch @@ -0,0 +1,38 @@ +From e8da1680d0273aaca806c23a10b4f3467a6b4f96 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Fri, 5 Sep 2014 15:43:56 -0600 +Subject: [PATCH 3/7] fix mvsdio eMMC timing + +These changes from Globalscale change the MMC timing to allow the eMMC versions +of the Mirabox and SMILE Plug to work. + +Signed-off-by: Kevin Mihelich +--- + drivers/mmc/host/mvsdio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c +index 629efbe639c4..c507c064736c 100644 +--- a/drivers/mmc/host/mvsdio.c ++++ b/drivers/mmc/host/mvsdio.c +@@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) + tmout_index = fls(tmout - 1) - 12; + if (tmout_index < 0) + tmout_index = 0; +- if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) ++// if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) //by steven, try to setup the timeout to maximum value + tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; + + dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", +@@ -613,6 +613,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) + u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; + if (m > MVSD_BASE_DIV_MAX) + m = MVSD_BASE_DIV_MAX; ++ if(ios->clock==50000000 ) //by steven ++ m=1; + mvsd_write(MVSD_CLK_DIV, m); + host->clock = ios->clock; + host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch new file mode 100644 index 0000000..fd99811 --- /dev/null +++ b/libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -0,0 +1,95 @@ +From f0eaedee0904275b2ed55b383dba794d53fac17d Mon Sep 17 00:00:00 2001 +From: popcornmix +Date: Tue, 18 Feb 2014 01:43:50 -0300 +Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter + +--- + drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c +index bc1e3dd67c04..51ae8e6fec4e 100644 +--- a/drivers/net/usb/smsc95xx.c ++++ b/drivers/net/usb/smsc95xx.c +@@ -50,6 +50,7 @@ + #define SUSPEND_SUSPEND3 (0x08) + #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ + SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3) ++#define MAC_ADDR_LEN (6) + + struct smsc95xx_priv { + u32 mac_cr; +@@ -67,6 +68,10 @@ static bool turbo_mode = true; + module_param(turbo_mode, bool, 0644); + MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); + ++static char *macaddr = ":"; ++module_param(macaddr, charp, 0); ++MODULE_PARM_DESC(macaddr, "MAC address"); ++ + static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, + u32 *data, int in_pm) + { +@@ -753,8 +758,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) + return phy_mii_ioctl(netdev->phydev, rq, cmd); + } + ++/* Check the macaddr module parameter for a MAC address */ ++static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) ++{ ++ int i, j, got_num, num; ++ u8 mtbl[MAC_ADDR_LEN]; ++ ++ if (macaddr[0] == ':') ++ return 0; ++ ++ i = 0; ++ j = 0; ++ num = 0; ++ got_num = 0; ++ while (j < MAC_ADDR_LEN) { ++ if (macaddr[i] && macaddr[i] != ':') { ++ got_num++; ++ if ('0' <= macaddr[i] && macaddr[i] <= '9') ++ num = num * 16 + macaddr[i] - '0'; ++ else if ('A' <= macaddr[i] && macaddr[i] <= 'F') ++ num = num * 16 + 10 + macaddr[i] - 'A'; ++ else if ('a' <= macaddr[i] && macaddr[i] <= 'f') ++ num = num * 16 + 10 + macaddr[i] - 'a'; ++ else ++ break; ++ i++; ++ } else if (got_num == 2) { ++ mtbl[j++] = (u8) num; ++ num = 0; ++ got_num = 0; ++ i++; ++ } else { ++ break; ++ } ++ } ++ ++ if (j == MAC_ADDR_LEN) { ++ netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " ++ "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], ++ mtbl[3], mtbl[4], mtbl[5]); ++ for (i = 0; i < MAC_ADDR_LEN; i++) ++ dev_mac[i] = mtbl[i]; ++ return 1; ++ } else { ++ return 0; ++ } ++} ++ + static void smsc95xx_init_mac_address(struct usbnet *dev) + { ++ /* Check module parameters */ ++ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr)) ++ return; ++ + u8 addr[ETH_ALEN]; + + /* maybe the boot loader passed the MAC address in devicetree */ +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch b/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch new file mode 100644 index 0000000..f090515 --- /dev/null +++ b/libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch @@ -0,0 +1,33 @@ +From 363e156344b831978306bf95dac7859dafe61d14 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sat, 14 Feb 2015 12:32:27 +0100 +Subject: [PATCH 5/7] set default cubietruck led triggers + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +index 52160e368304..21c8ef94c756 100644 +--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts ++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +@@ -78,6 +78,7 @@ leds { + led-0 { + label = "cubietruck:blue:usr"; + gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; + }; + + led-1 { +@@ -93,6 +94,7 @@ led-2 { + led-3 { + label = "cubietruck:green:usr"; + gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc0"; + }; + }; + +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch new file mode 100644 index 0000000..3190152 --- /dev/null +++ b/libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -0,0 +1,30 @@ +From b4dcf8b9c59c451b667f7cc3f20e7fe837951517 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Thu, 11 Aug 2016 00:42:37 -0600 +Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator + voltage + +Set a higher minimum voltage to help reboot issue. +http://www.spinics.net/lists/linux-samsung-soc/msg54434.html + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +index 5b1d4591b35c..8a8d2c6add10 100644 +--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi ++++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +@@ -436,7 +436,7 @@ buck1_reg: BUCK1 { + + buck2_reg: BUCK2 { + regulator-name = "VDD_ARM"; +- regulator-min-microvolt = <900000>; ++ regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; +-- +2.35.1 + diff --git a/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch b/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch new file mode 100644 index 0000000..711d50d --- /dev/null +++ b/libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch @@ -0,0 +1,561 @@ +From 915405b2da517ee56a07e57230273ab2ff4e522d Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sun, 11 Aug 2019 12:34:17 -0600 +Subject: [PATCH 7/7] USB Armory MkII support + +--- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx6ul-usbarmory.dts | 256 +++++++++++++++++++++++ + arch/arm/boot/dts/imx6ull-usbarmory.dts | 257 ++++++++++++++++++++++++ + 3 files changed, 515 insertions(+) + create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts + create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts + +diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile +index 235ad559acb2..ca79830160bd 100644 +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -694,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ + imx6ul-tx6ul-0010.dtb \ + imx6ul-tx6ul-0011.dtb \ + imx6ul-tx6ul-mainboard.dtb \ ++ imx6ul-usbarmory.dtb \ + imx6ull-14x14-evk.dtb \ + imx6ull-colibri-emmc-eval-v3.dtb \ + imx6ull-colibri-eval-v3.dtb \ +@@ -704,6 +705,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ + imx6ull-phytec-segin-ff-rdk-nand.dtb \ + imx6ull-phytec-segin-ff-rdk-emmc.dtb \ + imx6ull-phytec-segin-lc-rdk-nand.dtb \ ++ imx6ull-usbarmory.dtb \ + imx6ulz-14x14-evk.dtb \ + imx6ulz-bsh-smm-m2.dtb + dtb-$(CONFIG_SOC_IMX7D) += \ +diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts +new file mode 100644 +index 000000000000..1fdcd6f611d5 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts +@@ -0,0 +1,256 @@ ++/* ++ * USB armory Mk II device tree file ++ * https://github.com/inversepath/usbarmory ++ * ++ * Copyright (C) 2019, F-Secure Corporation ++ * Andrej Rosano ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6ul.dtsi" ++ ++/ { ++ model = "F-Secure USB armory Mk II"; ++ compatible = "inversepath,imx6ul-usbarmory-mkII", "fsl,imx6ul"; ++ ++ chosen { ++ stdout-path = &uart2; ++ }; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x80000000 0x20000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_led>; ++ ++ led-white { ++ label = "LED_WHITE"; ++ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ led-blue { ++ label = "LED_BLUE"; ++ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ regulators { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ reg_sd1_vmmc: sd1_regulator { ++ compatible = "regulator-fixed"; ++ regulator-name = "VSD_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ }; ++ }; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_bluetooth>; ++ uart-has-rtscts; ++ status = "okay"; ++}; ++ ++&uart2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart2>; ++ status = "okay"; ++}; ++ ++&usdhc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc1>; ++ no-1-8-v; ++ keep-power-in-suspend; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&usdhc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc2>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&i2c1 { ++ pinctrl-0 = <&pinctrl_i2c1>; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl_uart2: uart2grp { ++ fsl,pins = < ++ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 ++ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 ++ >; ++ }; ++ ++ pinctrl_bluetooth: uart1grp { ++ fsl,pins = < ++ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ ++ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ ++ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ ++ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ ++ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ ++ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ ++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ ++ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ ++ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ ++ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ ++ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ ++ >; ++ }; ++ ++ pinctrl_i2c1: i2c1grp { ++ fsl,pins = < ++ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 ++ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 ++ >; ++ }; ++ ++ pinctrl_led: ledgrp { ++ fsl,pins = < ++ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 ++ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 ++ >; ++ }; ++ ++ pinctrl_usdhc1: usdhc1grp { ++ fsl,pins = < ++ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 ++ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 ++ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 ++ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 ++ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 ++ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 ++ >; ++ }; ++ ++ pinctrl_usdhc2: usdhc2grp { ++ fsl,pins = < ++ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 ++ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 ++ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 ++ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 ++ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 ++ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 ++ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 ++ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 ++ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 ++ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 ++ >; ++ }; ++}; ++ ++&aips2 { ++ crypto: crypto@2140000 { ++ compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ reg = <0x2140000 0x3c000>; ++ ranges = <0 0x2140000 0x3c000>; ++ interrupts = ; ++ clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>, ++ <&clks IMX6UL_CLK_CAAM_MEM>; ++ clock-names = "ipg", "aclk", "mem"; ++ ++ sec_jr0: jr@1000 { ++ compatible = "fsl,sec-v4.0-job-ring"; ++ reg = <0x1000 0x1000>; ++ interrupts = ; ++ }; ++ ++ sec_jr1: jr@2000 { ++ compatible = "fsl,sec-v4.0-job-ring"; ++ reg = <0x2000 0x1000>; ++ interrupts = ; ++ }; ++ sec_jr2: jr@3000 { ++ compatible = "fsl,sec-v4.0-job-ring"; ++ reg = <0x3000 0x1000>; ++ interrupts = ; ++ }; ++ }; ++}; ++ ++/ { ++ soc { ++ caam_sm: caam-sm@00100000 { ++ compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm"; ++ reg = <0x00100000 0x3fff>; ++ }; ++ ++ irq_sec_vio: caam_secvio { ++ compatible = "fsl,imx7d-caam-secvio", "fsl,imx6q-caam-secvio"; ++ interrupts = ; ++ }; ++ }; ++ ++ caam_keyblob: caam-keyblob { ++ compatible = "fsl,sec-v4.0-keyblob"; ++ status = "okay"; ++ }; ++}; ++ ++&usbotg1 { ++ dr_mode = "peripheral"; ++ disable-over-current; ++ tpl-support; ++ status = "okay"; ++}; ++ ++&usbotg2 { ++ dr_mode = "host"; ++ disable-over-current; ++ tpl-support; ++ status = "okay"; ++}; +diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts +new file mode 100644 +index 000000000000..f74d0296d5f6 +--- /dev/null ++++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts +@@ -0,0 +1,257 @@ ++/* ++ * USB armory Mk II device tree file ++ * https://github.com/inversepath/usbarmory ++ * ++ * Copyright (C) 2019, F-Secure Corporation ++ * Andrej Rosano ++ * ++ * This file is dual-licensed: you can use it either under the terms ++ * of the GPL or the X11 license, at your option. Note that this dual ++ * licensing only applies to this file, and not this project as a ++ * whole. ++ * ++ * a) This file is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This file is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * Or, alternatively, ++ * ++ * b) Permission is hereby granted, free of charge, to any person ++ * obtaining a copy of this software and associated documentation ++ * files (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, ++ * copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following ++ * conditions: ++ * ++ * The above copyright notice and this permission notice shall be ++ * included in all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++/dts-v1/; ++ ++#include "imx6ul.dtsi" ++ ++/ { ++ model = "F-Secure USB armory Mk II"; ++ compatible = "inversepath,imx6ull-usbarmory-mkII", "fsl,imx6ull"; ++ ++ chosen { ++ stdout-path = &uart2; ++ }; ++ ++ memory { ++ device_type = "memory"; ++ reg = <0x80000000 0x20000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_led>; ++ ++ led-white { ++ label = "LED_WHITE"; ++ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ led-blue { ++ label = "LED_BLUE"; ++ gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ regulators { ++ compatible = "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ reg_sd1_vmmc: sd1_regulator { ++ compatible = "regulator-fixed"; ++ regulator-name = "VSD_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ }; ++ }; ++}; ++ ++/* Delete CAAM node in AIPS-2 (i.MX6UL specific) */ ++/delete-node/ &crypto; ++ ++&cpu0 { ++ operating-points = < ++ /* kHz uV */ ++ 900000 1275000 ++ 792000 1225000 ++ 528000 1175000 ++ 396000 1025000 ++ 198000 950000 ++ >; ++ fsl,soc-operating-points = < ++ /* KHz uV */ ++ 900000 1250000 ++ 792000 1175000 ++ 528000 1175000 ++ 396000 1175000 ++ 198000 1175000 ++ >; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_bluetooth>; ++ uart-has-rtscts; ++ status = "okay"; ++}; ++ ++&uart2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart2>; ++ status = "okay"; ++}; ++ ++&usdhc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc1>; ++ no-1-8-v; ++ keep-power-in-suspend; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&usdhc2 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_usdhc2>; ++ non-removable; ++ status = "okay"; ++}; ++ ++&i2c1 { ++ pinctrl-0 = <&pinctrl_i2c1>; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl_uart2: uart2grp { ++ fsl,pins = < ++ MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1 ++ MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1 ++ >; ++ }; ++ ++ pinctrl_bluetooth: uart1grp { ++ fsl,pins = < ++ MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */ ++ MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */ ++ MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */ ++ MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */ ++ MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */ ++ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */ ++ MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */ ++ MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */ ++ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */ ++ MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */ ++ MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */ ++ >; ++ }; ++ ++ pinctrl_i2c1: i2c1grp { ++ fsl,pins = < ++ MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0 ++ MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0 ++ >; ++ }; ++ ++ pinctrl_led: ledgrp { ++ fsl,pins = < ++ MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020 ++ MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020 ++ >; ++ }; ++ ++ pinctrl_usdhc1: usdhc1grp { ++ fsl,pins = < ++ MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019 ++ MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019 ++ MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019 ++ MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019 ++ MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019 ++ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019 ++ >; ++ }; ++ ++ pinctrl_usdhc2: usdhc2grp { ++ fsl,pins = < ++ MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071 ++ MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 ++ MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 ++ MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 ++ MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 ++ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 ++ MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 ++ MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 ++ MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 ++ MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 ++ >; ++ }; ++}; ++ ++/ { ++ soc { ++ aips3: aips-bus@02200000 { ++ compatible = "fsl,aips-bus", "simple-bus"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ reg = <0x02200000 0x100000>; ++ ranges; ++ ++ dcp: dcp@02280000 { ++ compatible = "fsl,imx6ull-dcp", "fsl,imx6sl-dcp", "fsl,imx28-dcp"; ++ reg = <0x02280000 0x4000>; ++ interrupts = , ++ , ++ ; ++ clocks = <&clks IMX6ULL_CLK_DCP_CLK>; ++ clock-names = "dcp"; ++ }; ++ ++ rngb: rngb@02284000 { ++ compatible = "fsl,imx6sl-rng", "fsl,imx25-rngb", "fsl,imx-rng", "imx-rng"; ++ reg = <0x02284000 0x4000>; ++ interrupts = ; ++ clocks = <&clks IMX6UL_CLK_DUMMY>; ++ }; ++ }; ++ }; ++}; ++ ++&usbotg1 { ++ dr_mode = "peripheral"; ++ disable-over-current; ++ tpl-support; ++ status = "okay"; ++}; ++ ++&usbotg2 { ++ dr_mode = "host"; ++ disable-over-current; ++ tpl-support; ++ status = "okay"; ++}; +-- +2.35.1 + diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index ca9cb98..51869b1 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -13,9 +13,13 @@ _replacesoldkernels=() _replacesoldmodules=() pkgbase=linux-libre-pck -pkgver=5.17.8.pck1 +pkgver=5.18.14.pck1 pkgrel=1 -pkgdesc='Linux-libre PCK' +pkgdesc='Linux-libre PCK (Parabola community kernel)' +zenver="${pkgver//pck/zen}" +aufsver=20220620 +rcnver=5.18.12 +rcnrel=armv7-x8 url='https://wiki.parabola.nu/PCK' arch=(i686 x86_64 armv7h) license=(GPL2) @@ -24,33 +28,73 @@ makedepends=( xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra ) options=('!strip') -_srcname=linux-5.17 +_srcname=linux-5.18 source=( "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##*-}-gnu/linux-libre-${_srcname##*-}-gnu.tar.xz"{,.sign} "https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.*}-gnu/patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu.xz"{,.sign} - "https://repo.parabola.nu/other/pck/patches/${pkgver%.*}-gnu/patch-${pkgver%.*}-gnu-${pkgver##*.}.patch"{,.sig} + "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig} + "https://framagit.org/Megver83/zen-patches/-/raw/main/patch-${zenver//.zen/-zen}.diff" + #"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-${_srcname##*-}.patch" + "https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_srcname##*-}/aufs-patches/0001-aufs-${aufsver}.patch" config.i686 config.x86_64 config.armv7h # the main kernel config files linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk + + # maintain the TTY over USB disconnects + # http://www.coreboot.org/EHCI_Gadget_Debug + 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch + # fix Atmel maXTouch touchscreen support + # https://labs.parabola.nu/issues/877 + # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html + 0002-fix-Atmel-maXTouch-touchscreen-support.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) no-ultra-zstd.patch ) +source_armv7h=( + # RCN patch (CM3 firmware deblobbed and bloatware removed) + "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig} + # Arch Linux ARM patches + 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch + 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch + 0003-fix-mvsdio-eMMC-timing.patch + 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch + 0005-set-default-cubietruck-led-triggers.patch + 0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch + 0007-USB-Armory-MkII-support.patch +) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. ) -sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c' +sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb' + 'SKIP' + '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34' + 'SKIP' + '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' - '71ba9ae3f75d72d2d86cc8cab1df463725e00088fb93b09553066a9b968d3a32abed77fac6011433377ac2970c8149a28e85ed25429da7dec56b47ba871cd4ae' + '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' - 'df322ff9c3fad418e875f8827cdd0a8f6a13a55c4656b87300f6a592ba56724e30c303ed94eb2d69eb95379c3c643ee5ff84771a03911efae7e212b8fa5d48bd' + '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '50de63086aef1cd4278fc7088ae537ae6eb4994a4e8d09edbc957ff90e7232b85ce37928117589a1a619ded90eb584b770579e6efc5d5b2cc3e4f6c6cd96a71a' - 'f18d743a28afde8af4701853dfb59bfe6f3789756f9ffa3658cb2c75a8af59cd30ae125b74882529ad81b2c399e42ea56fabdc1e4354d5ce2b84d8ac2d96a51f' - 'e92981457f0747cf9b595557459740155188b80e3908eb5cd35579c647bcaddc5be8376a2b4c47b984f52009c1764789bc9a009fb9b18207d524c32e8ad644e0' - '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b') + 'e86399efba97b385cb748e1f5e41dd777d9ce3c7a0affb33bfa6f3a3e7ca1c6d2b3a50b3341f1132cdd2be9590e817b82e73883698e50447e45ddc490c6b52a7' + 'f47bcdd8d32b0b2ff1c58d552e2fe83047b6aa183ba03670dfd4e0f1f27eec6808eab53904847b316d8e31c85b4d63a7f365c6a91008a6d6cbcf89639073a880' + '1f247490ca428c372194838919ba049e61f357249419998692c3a20cc6728d509b079f39f3edcc0f76342c437a350d28eefafe8aa743477cecbfff1bb43ea8bb' + '88369e64e767fe490c22a221a55a5aa51377995897b7462320d53d64c9e83cb57fba3ea8ec591f15263905f86dc9f23cca0492cbb6a562aeb1a0fab0f8e447cf' + '5bb7e9ed49793941ad078a4a8e1f711af0e47f2707fa56da9c913a0069a913264b620858a5ceb36d4fa6cd9788e41be42ea81e1626762035ded5b28b0c299792' + '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' + '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' + 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85') +sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9' + 'SKIP' + '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3' + '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78' + '5d2f228151148358b07744a9c09cf6e2420c4284735d4ce7dc925a1deb3970298cc95dd766ee13e094e2853847b016c3ebc2d61bb423e370b4bc33938367ebda' + 'a206c3dc678839831d72eefee997cbe1bb877af7f6f90dfe5cab0bd7d9686a3b13a2aba74c8fbe5533872e12306ac9ea1b5eede18ef3cf10b8d01361afd67e9c' + 'a1072dd808c63592178cc01ea3c36de946f277fb451b13c34f51a5ac134cde4a8a4d57487132af1c6d7b5820842cdda9dc4edb3da85d33bd02bf87a032c3263a' + '85b2e16a930b8066990c42f973d386dc3c6d62fdf3d1289bbb51df3df296c26f30051162fba49a42d38f71f05de926aa8c065097f14bd8e9f8e28a52949ead00' + '2e99582d8b670b6c6b27add14b60e957cbcf9cd6aae40491bd9dea6ac455c0ade0bbee21e3bdfb5e06ce83ad27c5a788404b05bf7ac93831ca18d2e60a67017c') _replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}") _replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}") @@ -73,11 +117,20 @@ prepare() { patch -Np1 < "../patch-${_srcname##*-}-gnu-${pkgver%.*}-gnu" fi + echo "Adding freedo as boot logo..." + install -m644 -t drivers/video/logo \ + ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm} + echo "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux-libre}" > localversion.20-pkgname + echo "Applying Zen Patch..." + sed -e "/^+EXTRAVERSION = -zen/s/zen/pck/" \ + -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \ + "../patch-${zenver//.zen/-zen}.diff" | patch -Np1 -i - + if [ "$CARCH" = "armv7h" ]; then local src_armv7h for src_armv7h in "${source_armv7h[@]}"; do @@ -120,8 +173,7 @@ prepare() { build() { cd $_srcname - make all - make htmldocs + make htmldocs all } _package() { @@ -130,7 +182,7 @@ _package() { optdepends=('wireless-regdb: to set the correct wireless channels of your country' 'linux-libre-firmware: firmware images needed for some devices') provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE VHBA-MODULE) - provides+=("${_replacesarchkernel[@]/%/=${pkgver//pck/zen}}" "LINUX-ABI_VERSION=${pkgver%.*}") + provides+=("${_replacesarchkernel[@]/%/=$zenver}" "LINUX-ABI_VERSION=${pkgver%.*}") conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") @@ -168,7 +220,7 @@ _package() { _package-headers() { pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel" depends=(pahole) - provides=("${_replacesarchkernel[@]/%/-headers=${pkgver//pck/zen}}") + provides=("${_replacesarchkernel[@]/%/-headers=$zenver}") conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") @@ -180,7 +232,7 @@ _package-headers() { localversion.* version vmlinux install -Dt "$builddir/kernel" -m644 kernel/Makefile install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile - if [[ $CARCH = i686 ]]; then + if [ "$CARCH" = "i686" ]; then install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu fi cp -t "$builddir" -a scripts @@ -271,7 +323,7 @@ _package-headers() { _package-docs() { pkgdesc="Documentation for the $pkgdesc kernel" - provides=("${_replacesarchkernel[@]/%/-docs=${pkgver//pck/zen}}") + provides=("${_replacesarchkernel[@]/%/-docs=$zenver}") conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") diff --git a/libre/linux-libre-pck/config.armv7h b/libre/linux-libre-pck/config.armv7h index cd5e1af..4a1a5eb 100644 --- a/libre/linux-libre-pck/config.armv7h +++ b/libre/linux-libre-pck/config.armv7h @@ -1,22 +1,22 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.17.8-gnu-pck1 Kernel Configuration +# Linux/arm 5.18.14-gnu-pck1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23800 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=23800 CONFIG_LLD_VERSION=0 -CONFIG_CC_CAN_LINK=y -CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_PAHOLE_VERSION=123 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -167,6 +167,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y # end of Scheduler features CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y @@ -275,6 +276,7 @@ CONFIG_PROFILING=y # end of General setup CONFIG_ARM=y +CONFIG_ARM_HAS_GROUP_RELOCS=y CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_DMA_USE_IOMMU=y CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 @@ -323,6 +325,7 @@ CONFIG_ARCH_MULTI_V6_V7=y # end of Multiple platform selection # CONFIG_ARCH_VIRT is not set +# CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_ARTPEC is not set @@ -587,6 +590,7 @@ CONFIG_HAVE_SMP=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y CONFIG_CURRENT_POINTER_IN_TPIDRURO=y +CONFIG_IRQSTACKS=y CONFIG_ARM_CPU_TOPOLOGY=y # CONFIG_SCHED_MC is not set # CONFIG_SCHED_SMT is not set @@ -625,7 +629,6 @@ CONFIG_HIGHMEM=y CONFIG_HIGHPTE=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_HW_PERF_EVENTS=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARM_MODULE_PLTS=y CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_ALIGNMENT_TRAP=y @@ -711,6 +714,7 @@ CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_CPU_IDLE_GOV_TEO is not set CONFIG_DT_IDLE_STATES=y +CONFIG_DT_IDLE_GENPD=y # # ARM CPU Idle Drivers @@ -846,6 +850,8 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_REL=y +CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y +CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y @@ -857,6 +863,8 @@ CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y +CONFIG_HAVE_ARCH_VMAP_STACK=y +CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y @@ -900,6 +908,7 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_TRIM_UNUSED_KSYMS is not set CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y +CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG_COMMON=y @@ -950,12 +959,12 @@ CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_PM=y CONFIG_BLOCK_HOLDER_DEPRECATED=y +CONFIG_BLK_MQ_STACKING=y # # IO Schedulers # CONFIG_MQ_IOSCHED_DEADLINE=y -# CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set CONFIG_MQ_IOSCHED_KYBER=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y @@ -1012,6 +1021,7 @@ CONFIG_KSM=y CONFIG_UKSM=y # CONFIG_KSM_LEGACY is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set @@ -1038,6 +1048,7 @@ CONFIG_ZSMALLOC=m # CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y CONFIG_ZONE_DMA=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_TEST is not set @@ -1141,7 +1152,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m -# CONFIG_TCP_CONG_BBR is not set +CONFIG_TCP_CONG_BBR=m # CONFIG_TCP_CONG_BBR2 is not set CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set @@ -1538,7 +1549,6 @@ CONFIG_BRIDGE_EBT_SNAT=m CONFIG_BRIDGE_EBT_LOG=m CONFIG_BRIDGE_EBT_NFLOG=m CONFIG_BPFILTER=y -CONFIG_BPFILTER_UMH=m CONFIG_IP_DCCP=m CONFIG_INET_DCCP_DIAG=m @@ -2039,6 +2049,7 @@ CONFIG_NET_SELFTESTS=y CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y +# CONFIG_PAGE_POOL_STATS is not set CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y @@ -2079,6 +2090,8 @@ CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set # CONFIG_PCIE_BUS_PERFORMANCE is not set # CONFIG_PCIE_BUS_PEER2PEER is not set +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_HOTPLUG_PCI is not set # @@ -2223,6 +2236,7 @@ CONFIG_ARM_SCMI_HAVE_TRANSPORT=y CONFIG_ARM_SCMI_HAVE_SHMEM=y CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SCMI_POWER_DOMAIN=y # end of ARM System Control and Management Interface Protocol @@ -2254,6 +2268,7 @@ CONFIG_RESET_ATTACK_MITIGATION=y # CONFIG_EFI_DISABLE_PCI_DMA is not set # end of EFI (Extensible Firmware Interface) Support +# CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_PSCI_CHECKER is not set CONFIG_HAVE_ARM_SMCCC=y @@ -2427,6 +2442,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set CONFIG_MTD_NAND_ECC_SW_BCH=y +# CONFIG_MTD_NAND_ECC_MXIC is not set # end of ECC engine support # end of NAND @@ -2497,6 +2513,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m # CONFIG_NVME_MULTIPATH is not set +# CONFIG_NVME_VERBOSE_ERRORS is not set # CONFIG_NVME_HWMON is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set @@ -2533,6 +2550,7 @@ CONFIG_SRAM_EXEC=y # CONFIG_PCI_ENDPOINT_TEST is not set # CONFIG_XILINX_SDFEC is not set # CONFIG_HISI_HIKEY_USB is not set +# CONFIG_OPEN_DICE is not set # CONFIG_C2PORT is not set # @@ -3025,7 +3043,9 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y # CONFIG_GEMINI_ETHERNET is not set +CONFIG_NET_VENDOR_DAVICOM=y # CONFIG_DM9000 is not set +# CONFIG_DM9051 is not set # CONFIG_DNET is not set CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3067,6 +3087,8 @@ CONFIG_GIANFAR=m # CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_ENETC_IERB is not set # CONFIG_FSL_ENETC_MDIO is not set +CONFIG_NET_VENDOR_FUNGIBLE=y +# CONFIG_FUN_ETH is not set CONFIG_NET_VENDOR_GOOGLE=y CONFIG_NET_VENDOR_HISILICON=y # CONFIG_HIX5HD2_GMAC is not set @@ -3611,6 +3633,7 @@ CONFIG_MT7915E=m CONFIG_MT7921_COMMON=m CONFIG_MT7921E=m CONFIG_MT7921S=m +# CONFIG_MT7921U is not set CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m @@ -3670,9 +3693,13 @@ CONFIG_RTL8XXXU=m # CONFIG_RTL8XXXU_UNTESTED is not set CONFIG_RTW88=m # CONFIG_RTW88_8822BE is not set +# CONFIG_RTW88_8822BU is not set # CONFIG_RTW88_8822CE is not set +# CONFIG_RTW88_8822CU is not set # CONFIG_RTW88_8723DE is not set +# CONFIG_RTW88_8723DU is not set # CONFIG_RTW88_8821CE is not set +# CONFIG_RTW88_8821CU is not set CONFIG_RTW89=m # CONFIG_RTW89_8852AE is not set CONFIG_WLAN_VENDOR_RSI=y @@ -3739,6 +3766,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=y CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=y +CONFIG_INPUT_VIVALDIFMAP=y # # Userland interfaces @@ -3906,6 +3934,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MELFAS_MIP4=m # CONFIG_TOUCHSCREEN_MSG2638 is not set CONFIG_TOUCHSCREEN_MTOUCH=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m @@ -4124,7 +4153,6 @@ CONFIG_CONSOLE_POLL=y # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_BCM63XX is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set CONFIG_SERIAL_XILINX_PS_UART=y @@ -4437,6 +4465,7 @@ CONFIG_PINCTRL_IMX7ULP=y # CONFIG_PINCTRL_IMX8MQ is not set # CONFIG_PINCTRL_IMX8ULP is not set # CONFIG_PINCTRL_IMXRT1050 is not set +# CONFIG_PINCTRL_IMX93 is not set CONFIG_PINCTRL_VF610=y CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON8=y @@ -4663,6 +4692,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_PDA_POWER is not set CONFIG_GENERIC_ADC_BATTERY=m +# CONFIG_IP5XXX_POWER is not set # CONFIG_TEST_POWER is not set # CONFIG_CHARGER_ADP5061 is not set CONFIG_BATTERY_ACT8945A=m @@ -4671,6 +4701,7 @@ CONFIG_BATTERY_DS2760=m # CONFIG_BATTERY_DS2780 is not set # CONFIG_BATTERY_DS2781 is not set # CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SAMSUNG_SDI is not set CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m CONFIG_MANAGER_SBS=m @@ -4722,6 +4753,7 @@ CONFIG_CHARGER_CROS_PCHG=y # CONFIG_CHARGER_BD99954 is not set # CONFIG_RN5T618_POWER is not set CONFIG_BATTERY_ACER_A500=m +# CONFIG_BATTERY_UG3105 is not set CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -4855,6 +4887,7 @@ CONFIG_SENSORS_IR38064=m CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_LM25066=m +# CONFIG_SENSORS_LM25066_REGULATOR is not set CONFIG_SENSORS_LTC2978=m CONFIG_SENSORS_LTC2978_REGULATOR=y CONFIG_SENSORS_LTC3815=m @@ -4870,6 +4903,7 @@ CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m # CONFIG_SENSORS_MP5023 is not set CONFIG_SENSORS_PIM4328=m +# CONFIG_SENSORS_PLI1209BC is not set CONFIG_SENSORS_PM6764TR=m CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_Q54SJ108A2=m @@ -4879,6 +4913,7 @@ CONFIG_SENSORS_TPS40422=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_XDPE122=m +# CONFIG_SENSORS_XDPE122_REGULATOR is not set CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m @@ -4890,6 +4925,7 @@ CONFIG_SENSORS_SHT3x=m # CONFIG_SENSORS_SHT4x is not set CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m +# CONFIG_SENSORS_SY7636A is not set CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -4917,6 +4953,7 @@ CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP108=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m +# CONFIG_SENSORS_TMP464 is not set # CONFIG_SENSORS_TMP513 is not set CONFIG_SENSORS_VEXPRESS=y # CONFIG_SENSORS_VIA686A is not set @@ -5134,6 +5171,7 @@ CONFIG_MFD_MAX14577=y # CONFIG_MFD_MAX77650 is not set CONFIG_MFD_MAX77686=y CONFIG_MFD_MAX77693=y +# CONFIG_MFD_MAX77714 is not set # CONFIG_MFD_MAX77843 is not set CONFIG_MFD_MAX8907=y # CONFIG_MFD_MAX8925 is not set @@ -5158,6 +5196,7 @@ CONFIG_MFD_RK808=y CONFIG_MFD_RN5T618=y CONFIG_MFD_SEC_CORE=y # CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SIMPLE_MFD_I2C is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SKY81452 is not set CONFIG_MFD_STMPE=y @@ -5295,6 +5334,7 @@ CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RN5T618=y # CONFIG_REGULATOR_RT4801 is not set +# CONFIG_REGULATOR_RT5190A is not set # CONFIG_REGULATOR_RT6160 is not set # CONFIG_REGULATOR_RT6245 is not set # CONFIG_REGULATOR_RTQ2134 is not set @@ -5306,11 +5346,13 @@ CONFIG_REGULATOR_S5M8767=y # CONFIG_REGULATOR_SLG51000 is not set CONFIG_REGULATOR_STPMIC1=y CONFIG_REGULATOR_TI_ABB=y +# CONFIG_REGULATOR_SY7636A is not set CONFIG_REGULATOR_SY8106A=y # CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_SY8827N is not set CONFIG_REGULATOR_TPS51632=y CONFIG_REGULATOR_TPS62360=y +# CONFIG_REGULATOR_TPS6286X is not set CONFIG_REGULATOR_TPS65023=y CONFIG_REGULATOR_TPS6507X=y # CONFIG_REGULATOR_TPS65086 is not set @@ -5326,44 +5368,44 @@ CONFIG_REGULATOR_VCTRL=y CONFIG_REGULATOR_VEXPRESS=y CONFIG_REGULATOR_WM8994=y CONFIG_RC_CORE=m -CONFIG_RC_MAP=m CONFIG_LIRC=y +CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RCMM_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_SONY_DECODER=m CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_IR_RCMM_DECODER=m CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m +CONFIG_IR_GPIO_CIR=m +CONFIG_IR_GPIO_TX=m CONFIG_IR_HIX5HD2=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m CONFIG_IR_MCEUSB=m CONFIG_IR_MESON=m # CONFIG_IR_MESON_TX is not set +CONFIG_IR_PWM_TX=m CONFIG_IR_REDRAT3=m +CONFIG_IR_RX51=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_SPI=m CONFIG_IR_STREAMZAP=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m +CONFIG_IR_SUNXI=m +# CONFIG_IR_TOY is not set CONFIG_IR_TTUSBIR=m -CONFIG_IR_RX51=m +CONFIG_RC_ATI_REMOTE=m CONFIG_RC_LOOPBACK=m -CONFIG_IR_GPIO_CIR=m -CONFIG_IR_GPIO_TX=m -CONFIG_IR_PWM_TX=m -CONFIG_IR_SUNXI=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y # CONFIG_RC_XBOX_DVD is not set -# CONFIG_IR_TOY is not set CONFIG_CEC_CORE=y CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y @@ -5411,7 +5453,6 @@ CONFIG_DVB_CORE=y # # Video4Linux options # -CONFIG_VIDEO_V4L2=y CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -5450,17 +5491,17 @@ CONFIG_DVB_DYNAMIC_MINORS=y # # Media drivers # + +# +# Media drivers +# CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m @@ -5485,13 +5526,13 @@ CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SPCA500=m CONFIG_USB_GSPCA_SPCA501=m CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m @@ -5507,29 +5548,33 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_GL860=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m +CONFIG_USB_STKWEBCAM=m CONFIG_VIDEO_USBTV=m +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m # # Analog TV USB devices # +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m # # Analog/digital TV USB devices @@ -5548,34 +5593,9 @@ CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -# CONFIG_DVB_USB_CXUSB_ANALOG is not set -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_AS102=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m @@ -5583,19 +5603,44 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_CXUSB=m +# CONFIG_DVB_USB_CXUSB_ANALOG is not set +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_VP7045=m +CONFIG_SMS_USB_DRV=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices @@ -5625,17 +5670,19 @@ CONFIG_VIDEO_TW68=m # # Media capture/analog TV support # +CONFIG_VIDEO_DT3155=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m # # Media capture/analog/hybrid TV support # +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -5649,8 +5696,6 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_ENABLE_VP3054=y CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -5661,239 +5706,227 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m +CONFIG_DVB_NETUP_UNIDVB=m CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m CONFIG_RADIO_ADAPTERS=y +# CONFIG_RADIO_MAXIRADIO is not set +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_RADIO_SI4713=m CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m +CONFIG_USB_DSBR=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_USB_MR800=m +CONFIG_USB_RAREMONO=m CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -# CONFIG_RADIO_MAXIRADIO is not set -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_TTPCI_EEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_MEDIA_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -# CONFIG_VIDEO_CADENCE is not set -# CONFIG_VIDEO_ASPEED is not set -CONFIG_VIDEO_MUX=m -CONFIG_VIDEO_OMAP3=m -# CONFIG_VIDEO_OMAP3_DEBUG is not set -# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set -CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m -CONFIG_VIDEO_EXYNOS4_IS_COMMON=m -CONFIG_VIDEO_S5P_FIMC=m -CONFIG_VIDEO_S5P_MIPI_CSIS=m -CONFIG_VIDEO_EXYNOS_FIMC_LITE=m -CONFIG_VIDEO_EXYNOS4_FIMC_IS=m -CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y -CONFIG_VIDEO_AM437X_VPFE=m -CONFIG_VIDEO_XILINX=m -# CONFIG_VIDEO_XILINX_CSI2RXSS is not set -CONFIG_VIDEO_XILINX_TPG=m -CONFIG_VIDEO_XILINX_VTC=m -CONFIG_VIDEO_SUN4I_CSI=m -CONFIG_VIDEO_SUN6I_CSI=m -# CONFIG_VIDEO_TI_CAL is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set +CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_CODA=m -CONFIG_VIDEO_IMX_VDOA=m -CONFIG_VIDEO_IMX_PXP=m -# CONFIG_VIDEO_IMX8_JPEG is not set CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -# CONFIG_VIDEO_MESON_GE2D is not set -# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set -CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m -CONFIG_VIDEO_SAMSUNG_S5P_MFC=m -CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m -CONFIG_VIDEO_ROCKCHIP_RGA=m -CONFIG_VIDEO_TI_VPE=m -# CONFIG_VIDEO_TI_VPE_DEBUG is not set -# CONFIG_VIDEO_SUN8I_DEINTERLACE is not set -# CONFIG_VIDEO_SUN8I_ROTATE is not set -CONFIG_VIDEO_TI_VPDMA=m -CONFIG_VIDEO_TI_SC=m -CONFIG_VIDEO_TI_CSC=m -CONFIG_DVB_PLATFORM_DRIVERS=y -CONFIG_DVB_C8SECTPFE=m -# CONFIG_SDR_PLATFORM_DRIVERS is not set +CONFIG_VIDEO_MUX=m # -# MMC/SDIO DVB adapters +# Allegro DVT media platform drivers # -CONFIG_SMS_SDIO_DRV=m -# CONFIG_V4L_TEST_DRIVERS is not set -# CONFIG_DVB_TEST_DRIVERS is not set -# end of Media drivers # -# Media ancillary drivers +# Amlogic media platform drivers # -CONFIG_MEDIA_ATTACH=y +# CONFIG_VIDEO_MESON_GE2D is not set # -# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# Amphion drivers # -CONFIG_VIDEO_IR_I2C=m +# CONFIG_VIDEO_AMPHION_VPU is not set # -# Audio decoders, processors and mixers +# Aspeed media platform drivers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -# CONFIG_VIDEO_TDA1997X is not set -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m -# end of Audio decoders, processors and mixers +# CONFIG_VIDEO_ASPEED is not set # -# RDS decoders +# Atmel media platform drivers # -CONFIG_VIDEO_SAA6588=m -# end of RDS decoders # -# Video decoders +# Cadence media platform drivers # -# CONFIG_VIDEO_ADV7180 is not set -# CONFIG_VIDEO_ADV7183 is not set -# CONFIG_VIDEO_ADV748X is not set -# CONFIG_VIDEO_ADV7604 is not set -# CONFIG_VIDEO_ADV7842 is not set -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -# CONFIG_VIDEO_BT866 is not set -CONFIG_VIDEO_KS0127=m -# CONFIG_VIDEO_ML86V7667 is not set -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -# CONFIG_VIDEO_TC358743 is not set -# CONFIG_VIDEO_TVP514X is not set -CONFIG_VIDEO_TVP5150=m -# CONFIG_VIDEO_TVP7002 is not set -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m -# CONFIG_VIDEO_TW9910 is not set -CONFIG_VIDEO_VPX3220=m -# CONFIG_VIDEO_MAX9286 is not set +# CONFIG_VIDEO_CADENCE_CSI2RX is not set +# CONFIG_VIDEO_CADENCE_CSI2TX is not set # -# Video and audio decoders +# Chips&Media media platform drivers # -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m -# end of Video decoders +CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_IMX_VDOA=m # -# Video encoders +# Intel media platform drivers # -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m -# CONFIG_VIDEO_ADV7343 is not set -# CONFIG_VIDEO_ADV7393 is not set -# CONFIG_VIDEO_AD9389B is not set -# CONFIG_VIDEO_AK881X is not set -# CONFIG_VIDEO_THS8200 is not set -# end of Video encoders # -# Video improvement chips +# Marvell media platform drivers # -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -# end of Video improvement chips +CONFIG_VIDEO_CAFE_CCIC=m # -# Audio/Video compression chips +# Mediatek media platform drivers # -CONFIG_VIDEO_SAA6752HS=m -# end of Audio/Video compression chips # -# SDR tuner chips +# NVidia media platform drivers # -# CONFIG_SDR_MAX2175 is not set -# end of SDR tuner chips +# CONFIG_VIDEO_TEGRA_VDE is not set # -# Miscellaneous helper chips +# NXP media platform drivers # -# CONFIG_VIDEO_THS7303 is not set -CONFIG_VIDEO_M52790=m -# CONFIG_VIDEO_I2C is not set -# CONFIG_VIDEO_ST_MIPID02 is not set -# end of Miscellaneous helper chips +# CONFIG_VIDEO_IMX_MIPI_CSIS is not set +CONFIG_VIDEO_IMX_PXP=m +# CONFIG_VIDEO_IMX8_JPEG is not set + +# +# Qualcomm media platform drivers +# + +# +# Renesas media platform drivers +# + +# +# Rockchip media platform drivers +# +CONFIG_VIDEO_ROCKCHIP_RGA=m +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set + +# +# Samsung media platform drivers +# +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m +CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m +CONFIG_VIDEO_EXYNOS4_IS_COMMON=m +CONFIG_VIDEO_S5P_FIMC=m +CONFIG_VIDEO_S5P_MIPI_CSIS=m +CONFIG_VIDEO_EXYNOS_FIMC_LITE=m +CONFIG_VIDEO_EXYNOS4_FIMC_IS=m +CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y +# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m + +# +# STMicroelectronics media platform drivers +# +CONFIG_DVB_C8SECTPFE=m + +# +# Sunxi media platform drivers +# +CONFIG_VIDEO_SUN4I_CSI=m +CONFIG_VIDEO_SUN6I_CSI=m +# CONFIG_VIDEO_SUN8I_DEINTERLACE is not set +# CONFIG_VIDEO_SUN8I_ROTATE is not set + +# +# Texas Instruments drivers +# +CONFIG_VIDEO_TI_VPDMA=m +CONFIG_VIDEO_TI_SC=m +CONFIG_VIDEO_TI_CSC=m +# CONFIG_VIDEO_TI_CAL is not set +CONFIG_VIDEO_TI_VPE=m +# CONFIG_VIDEO_TI_VPE_DEBUG is not set +CONFIG_VIDEO_AM437X_VPFE=m +CONFIG_VIDEO_OMAP3=m +# CONFIG_VIDEO_OMAP3_DEBUG is not set + +# +# VIA media platform drivers +# + +# +# Xilinx media platform drivers +# +CONFIG_VIDEO_XILINX=m +# CONFIG_VIDEO_XILINX_CSI2RXSS is not set +CONFIG_VIDEO_XILINX_TPG=m +CONFIG_VIDEO_XILINX_VTC=m + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=m +# CONFIG_V4L_TEST_DRIVERS is not set +# CONFIG_DVB_TEST_DRIVERS is not set +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_TTPCI_EEPROM=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m # # Camera sensor devices # # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set +# CONFIG_VIDEO_HI847 is not set # CONFIG_VIDEO_IMX208 is not set # CONFIG_VIDEO_IMX214 is not set # CONFIG_VIDEO_IMX219 is not set @@ -5905,7 +5938,21 @@ CONFIG_VIDEO_M52790=m # CONFIG_VIDEO_IMX335 is not set # CONFIG_VIDEO_IMX355 is not set # CONFIG_VIDEO_IMX412 is not set +# CONFIG_VIDEO_MT9M001 is not set +# CONFIG_VIDEO_MT9M032 is not set +# CONFIG_VIDEO_MT9M111 is not set +# CONFIG_VIDEO_MT9P031 is not set +# CONFIG_VIDEO_MT9T001 is not set +# CONFIG_VIDEO_MT9T112 is not set +CONFIG_VIDEO_MT9V011=m +# CONFIG_VIDEO_MT9V032 is not set +# CONFIG_VIDEO_MT9V111 is not set +CONFIG_VIDEO_NOON010PC30=m +# CONFIG_VIDEO_OG01A1B is not set # CONFIG_VIDEO_OV02A10 is not set +# CONFIG_VIDEO_OV08D10 is not set +# CONFIG_VIDEO_OV13858 is not set +# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set @@ -5914,76 +5961,162 @@ CONFIG_VIDEO_OV2640=m # CONFIG_VIDEO_OV5645 is not set # CONFIG_VIDEO_OV5647 is not set # CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV5670 is not set # CONFIG_VIDEO_OV5675 is not set # CONFIG_VIDEO_OV5693 is not set # CONFIG_VIDEO_OV5695 is not set +# CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV7251 is not set -# CONFIG_VIDEO_OV772X is not set CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m +# CONFIG_VIDEO_OV772X is not set # CONFIG_VIDEO_OV7740 is not set # CONFIG_VIDEO_OV8856 is not set # CONFIG_VIDEO_OV8865 is not set # CONFIG_VIDEO_OV9282 is not set # CONFIG_VIDEO_OV9640 is not set # CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -# CONFIG_VIDEO_MT9M111 is not set -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set -CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -# CONFIG_VIDEO_M5MOLS is not set # CONFIG_VIDEO_RDACM20 is not set # CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_S5K6A3 is not set +# CONFIG_VIDEO_S5C73M3 is not set # CONFIG_VIDEO_S5K4ECGX is not set # CONFIG_VIDEO_S5K5BAF is not set +# CONFIG_VIDEO_S5K6A3 is not set +# CONFIG_VIDEO_S5K6AA is not set +CONFIG_VIDEO_SR030PC30=m +# CONFIG_VIDEO_VS6624 is not set # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_S5C73M3 is not set +# CONFIG_VIDEO_M5MOLS is not set # end of Camera sensor devices # -# Lens drivers +# Lens drivers +# +# CONFIG_VIDEO_AD5820 is not set +# CONFIG_VIDEO_AK7375 is not set +# CONFIG_VIDEO_DW9714 is not set +# CONFIG_VIDEO_DW9768 is not set +# CONFIG_VIDEO_DW9807_VCM is not set +# end of Lens drivers + +# +# Flash devices +# +# CONFIG_VIDEO_ADP1653 is not set +# CONFIG_VIDEO_LM3560 is not set +# CONFIG_VIDEO_LM3646 is not set +# end of Flash devices + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_SONY_BTF_MPX=m +# CONFIG_VIDEO_TDA1997X is not set +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_TLV320AIC23B=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_WM8775=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +# CONFIG_VIDEO_ADV7180 is not set +# CONFIG_VIDEO_ADV7183 is not set +# CONFIG_VIDEO_ADV748X is not set +# CONFIG_VIDEO_ADV7604 is not set +# CONFIG_VIDEO_ADV7842 is not set +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_ISL7998X is not set +CONFIG_VIDEO_KS0127=m +# CONFIG_VIDEO_MAX9286 is not set +# CONFIG_VIDEO_ML86V7667 is not set +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_TC358743 is not set +# CONFIG_VIDEO_TVP514X is not set +CONFIG_VIDEO_TVP5150=m +# CONFIG_VIDEO_TVP7002 is not set +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +# CONFIG_VIDEO_TW9910 is not set +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders # -# CONFIG_VIDEO_AD5820 is not set -# CONFIG_VIDEO_AK7375 is not set -# CONFIG_VIDEO_DW9714 is not set -# CONFIG_VIDEO_DW9768 is not set -# CONFIG_VIDEO_DW9807_VCM is not set -# end of Lens drivers +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders # -# Flash devices +# Video encoders # -# CONFIG_VIDEO_ADP1653 is not set -# CONFIG_VIDEO_LM3560 is not set -# CONFIG_VIDEO_LM3646 is not set -# end of Flash devices +# CONFIG_VIDEO_AD9389B is not set +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +# CONFIG_VIDEO_ADV7343 is not set +# CONFIG_VIDEO_ADV7393 is not set +# CONFIG_VIDEO_AK881X is not set +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +# CONFIG_VIDEO_THS8200 is not set +# end of Video encoders # -# SPI helper chips +# Video improvement chips # -# CONFIG_VIDEO_GS1662 is not set -# end of SPI helper chips +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +# CONFIG_SDR_MAX2175 is not set +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +# CONFIG_VIDEO_I2C is not set +CONFIG_VIDEO_M52790=m +# CONFIG_VIDEO_ST_MIPID02 is not set +# CONFIG_VIDEO_THS7303 is not set +# end of Miscellaneous helper chips # # Media SPI Adapters # # CONFIG_CXD2880_SPI_DRV is not set +# CONFIG_VIDEO_GS1662 is not set # end of Media SPI Adapters CONFIG_MEDIA_TUNER=y @@ -5991,43 +6124,43 @@ CONFIG_MEDIA_TUNER=y # # Customize TV tuners # -CONFIG_MEDIA_TUNER_SIMPLE=y -CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=y -CONFIG_MEDIA_TUNER_TDA827X=y -CONFIG_MEDIA_TUNER_TDA18271=y -CONFIG_MEDIA_TUNER_TDA9887=y -CONFIG_MEDIA_TUNER_TEA5761=y -CONFIG_MEDIA_TUNER_TEA5767=y +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_MC44S803=y CONFIG_MEDIA_TUNER_MSI001=m -CONFIG_MEDIA_TUNER_MT20XX=y CONFIG_MEDIA_TUNER_MT2060=m CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MT20XX=y CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=y -CONFIG_MEDIA_TUNER_XC5000=y -CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MXL301RF=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=y -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_SI2157=m +CONFIG_MEDIA_TUNER_SIMPLE=y CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_TDA18218=m +CONFIG_MEDIA_TUNER_TDA18250=m +CONFIG_MEDIA_TUNER_TDA18271=y +CONFIG_MEDIA_TUNER_TDA827X=y +CONFIG_MEDIA_TUNER_TDA8290=y +CONFIG_MEDIA_TUNER_TDA9887=y +CONFIG_MEDIA_TUNER_TEA5761=y +CONFIG_MEDIA_TUNER_TEA5767=y CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_XC2028=y +CONFIG_MEDIA_TUNER_XC4000=y +CONFIG_MEDIA_TUNER_XC5000=y # end of Customize TV tuners # @@ -6037,126 +6170,126 @@ CONFIG_MEDIA_TUNER_QM1D1B0004=m # # Multistandard (satellite) frontends # +CONFIG_DVB_M88DS3103=m +CONFIG_DVB_MXL5XX=m CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV0910=m CONFIG_DVB_STV6110x=m CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_TDA18271C2DD=m # # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m CONFIG_DVB_CX24123=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m +CONFIG_DVB_SI21XX=m CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0288=m CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_TDA10071=m CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP887X=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_AS102_FE=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -# CONFIG_DVB_S5H1432 is not set -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m # CONFIG_DVB_DIB9000 is not set -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m +CONFIG_DVB_DRXD=m CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_L64781=m +CONFIG_DVB_MT352=m +CONFIG_DVB_NXT6000=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m CONFIG_DVB_RTL2832_SDR=m +# CONFIG_DVB_S5H1432 is not set CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_TDA1004X=m CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_ZL10353=m # CONFIG_DVB_CXD2880 is not set # # DVB-C (cable) frontends # -CONFIG_DVB_VES1820=m +CONFIG_DVB_STV0297=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m +CONFIG_DVB_VES1820=m # # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LG2160=m CONFIG_DVB_LGDT3305=m CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_MXL692=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_OR51211=m CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_S5H1411=m -CONFIG_DVB_MXL692=m # # ISDB-T (terrestrial) frontends # -CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_S921=m # # ISDB-S (satellite) & ISDB-T (terrestrial) frontends # -CONFIG_DVB_TC90522=m # CONFIG_DVB_MN88443X is not set +CONFIG_DVB_TC90522=m # # Digital terrestrial only tuners/PLL @@ -6168,25 +6301,25 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -# CONFIG_DVB_LNBH29 is not set -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m +CONFIG_DVB_A8293=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_HELENE=m +CONFIG_DVB_HORUS3A=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m +CONFIG_DVB_IX2505V=m # CONFIG_DVB_LGS8GL5 is not set CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m -CONFIG_DVB_IX2505V=m +CONFIG_DVB_LNBH25=m +# CONFIG_DVB_LNBH29 is not set +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_DRX39XYJ=m # # Common Interface (EN50221) controller drivers @@ -6204,8 +6337,6 @@ CONFIG_DVB_DUMMY_FE=m # # Graphics support # -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y CONFIG_IMX_IPUV3_CORE=m @@ -6216,6 +6347,7 @@ CONFIG_DRM_DP_AUX_BUS=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DEBUG_MM is not set # CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_DP_HELPER=y CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -6328,7 +6460,6 @@ CONFIG_DRM_QXL=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_MSM=y CONFIG_DRM_MSM_GPU_STATE=y -# CONFIG_DRM_MSM_REGISTER_LOGGING is not set # CONFIG_DRM_MSM_GPU_SUDO is not set CONFIG_DRM_MSM_HDMI_HDCP=y CONFIG_DRM_MSM_DP=y @@ -6379,6 +6510,7 @@ CONFIG_DRM_PANEL_SAMSUNG_LD9040=m # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set @@ -6409,7 +6541,6 @@ CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set @@ -6433,6 +6564,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CHRONTEL_CH7033 is not set # CONFIG_DRM_CROS_EC_ANX7688 is not set CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set @@ -6491,6 +6623,7 @@ CONFIG_DRM_MESON_DW_HDMI=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GM12U320=m +# CONFIG_DRM_PANEL_MIPI_DBI is not set CONFIG_DRM_SIMPLEDRM=y CONFIG_TINYDRM_HX8357D=m CONFIG_TINYDRM_ILI9163=m @@ -6508,6 +6641,7 @@ CONFIG_DRM_PANFROST=m # CONFIG_DRM_MCDE is not set # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set +# CONFIG_DRM_SSD130X is not set CONFIG_DRM_LEGACY=y # CONFIG_DRM_TDFX is not set # CONFIG_DRM_R128 is not set @@ -7003,6 +7137,7 @@ CONFIG_SND_SOC_AK4554=m # CONFIG_SND_SOC_AK5558 is not set # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALC5632=m +# CONFIG_SND_SOC_AW8738 is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CROS_EC_CODEC=m @@ -7101,6 +7236,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_TAS5086 is not set # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TAS5805M is not set # CONFIG_SND_SOC_TAS6424 is not set # CONFIG_SND_SOC_TDA7419 is not set # CONFIG_SND_SOC_TFA9879 is not set @@ -7220,6 +7356,7 @@ CONFIG_HID_GEMBIRD=m CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_VIVALDI_COMMON=m # CONFIG_HID_GOOGLE_HAMMER is not set CONFIG_HID_VIVALDI=m # CONFIG_HID_GT683R is not set @@ -7271,12 +7408,14 @@ CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLAYSTATION=m CONFIG_PLAYSTATION_FF=y +# CONFIG_HID_RAZER is not set CONFIG_HID_PRIMAX=m CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SEMITEK=m +# CONFIG_HID_SIGMAMICRO is not set CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m @@ -7719,8 +7858,10 @@ CONFIG_TYPEC=y # CONFIG_TYPEC_TCPM is not set # CONFIG_TYPEC_UCSI is not set # CONFIG_TYPEC_TPS6598X is not set +# CONFIG_TYPEC_RT1719 is not set CONFIG_TYPEC_HD3SS3220=y # CONFIG_TYPEC_STUSB160X is not set +# CONFIG_TYPEC_WUSB3801 is not set # # USB Type-C Multiplexer/DeMultiplexer Switch support @@ -8232,7 +8373,6 @@ CONFIG_ADIS16240=m # Analog to digital converters # CONFIG_AD7816=m -CONFIG_AD7280=m # end of Analog to digital converters # @@ -8303,7 +8443,6 @@ CONFIG_VIDEO_OMAP4=m # CONFIG_VIDEO_ROCKCHIP_VDEC is not set CONFIG_VIDEO_SUNXI=y CONFIG_VIDEO_SUNXI_CEDRUS=m -CONFIG_TEGRA_VDE=m # CONFIG_VIDEO_ZORAN is not set # CONFIG_VIDEO_TEGRA is not set CONFIG_DVB_AV7110_IR=y @@ -8311,15 +8450,8 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_SP8870=m - -# -# Android -# -# end of Android - # CONFIG_STAGING_BOARD is not set CONFIG_LTE_GDM724X=m -CONFIG_GS_FPGABOOT=m # CONFIG_UNISYSSPAR is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set CONFIG_FB_TFT=m @@ -8407,13 +8539,13 @@ CONFIG_COMMON_CLK_SI5351=y # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_COMMON_CLK_LAN966X is not set CONFIG_COMMON_CLK_S2MPS11=y CONFIG_CLK_TWL6040=y CONFIG_COMMON_CLK_AXI_CLKGEN=y CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_PALMAS=y CONFIG_COMMON_CLK_PWM=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set CONFIG_CLK_BCM2711_DVP=y @@ -8434,6 +8566,7 @@ CONFIG_CLK_VF610=y # CONFIG_CLK_IMX8MP is not set # CONFIG_CLK_IMX8MQ is not set # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set # # Clock support for Amlogic platforms @@ -8475,6 +8608,7 @@ CONFIG_SUNXI_CCU=y CONFIG_SUN4I_A10_CCU=y CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_A83T_CCU=y @@ -8586,6 +8720,7 @@ CONFIG_PRU_REMOTEPROC=m # CONFIG_RPMSG=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG_NS=m # CONFIG_RPMSG_QCOM_GLINK_RPM is not set CONFIG_RPMSG_VIRTIO=m @@ -8760,6 +8895,8 @@ CONFIG_ADXL313_SPI=m CONFIG_ADXL355=m CONFIG_ADXL355_I2C=m CONFIG_ADXL355_SPI=m +# CONFIG_ADXL367_SPI is not set +# CONFIG_ADXL367_I2C is not set CONFIG_ADXL372=m CONFIG_ADXL372_SPI=m CONFIG_ADXL372_I2C=m @@ -8814,6 +8951,7 @@ CONFIG_AD7091R5=m CONFIG_AD7124=m CONFIG_AD7192=m CONFIG_AD7266=m +CONFIG_AD7280=m CONFIG_AD7291=m CONFIG_AD7292=m CONFIG_AD7298=m @@ -8902,6 +9040,7 @@ CONFIG_IIO_RESCALE=m # Amplifiers # CONFIG_AD8366=m +# CONFIG_ADA4250 is not set CONFIG_HMC425=m # end of Amplifiers @@ -8980,6 +9119,7 @@ CONFIG_AD5592R=m CONFIG_AD5593R=m CONFIG_AD5504=m CONFIG_AD5624R_SPI=m +# CONFIG_LTC2688 is not set CONFIG_AD5686=m CONFIG_AD5686_SPI=m CONFIG_AD5696_I2C=m @@ -9036,6 +9176,7 @@ CONFIG_AD9523=m CONFIG_ADF4350=m CONFIG_ADF4371=m CONFIG_ADMV1013=m +# CONFIG_ADMV4420 is not set CONFIG_ADRF6780=m # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -9302,7 +9443,10 @@ CONFIG_MB1232=m CONFIG_PING=m CONFIG_RFD77402=m CONFIG_SRF04=m +CONFIG_SX_COMMON=m CONFIG_SX9310=m +# CONFIG_SX9324 is not set +# CONFIG_SX9360 is not set CONFIG_SX9500=m CONFIG_SRF08=m CONFIG_VCNL3020=m @@ -9427,11 +9571,9 @@ CONFIG_PHY_MESON_AXG_MIPI_DPHY=y # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set +# CONFIG_PHY_CADENCE_DPHY_RX is not set # CONFIG_PHY_CADENCE_SIERRA is not set # CONFIG_PHY_CADENCE_SALVO is not set -# CONFIG_PHY_FSL_IMX8MQ_USB is not set -# CONFIG_PHY_MIXEL_MIPI_DPHY is not set -# CONFIG_PHY_FSL_IMX8M_PCIE is not set CONFIG_ARMADA375_USBCLUSTER_PHY=y # CONFIG_PHY_MVEBU_A3700_COMPHY is not set # CONFIG_PHY_MVEBU_A3700_UTMI is not set @@ -9453,6 +9595,7 @@ CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y # CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set CONFIG_PHY_ROCKCHIP_PCIE=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PHY_ROCKCHIP_USB=y @@ -9563,6 +9706,7 @@ CONFIG_TI_EQEP=m # CONFIG_MICROCHIP_TCB_CAPTURE is not set # CONFIG_INTEL_QEP is not set # CONFIG_MOST is not set +# CONFIG_PECI is not set # end of Device Drivers # @@ -9620,6 +9764,7 @@ CONFIG_F2FS_FS_SECURITY=y # CONFIG_F2FS_FAULT_INJECTION is not set # CONFIG_F2FS_FS_COMPRESSION is not set CONFIG_F2FS_IOSTAT=y +# CONFIG_F2FS_UNFAIR_RWSEM is not set # CONFIG_ZONEFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -9822,7 +9967,6 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -9940,7 +10084,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set # CONFIG_SECURITY_SELINUX is not set @@ -10029,6 +10172,7 @@ CONFIG_CRYPTO_ENGINE=y # CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=m +# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m # CONFIG_CRYPTO_ECDSA is not set @@ -10081,6 +10225,7 @@ CONFIG_CRYPTO_XXHASH=y CONFIG_CRYPTO_BLAKE2B=y # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m @@ -10256,9 +10401,11 @@ CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=y CONFIG_CRC_T10DIF=y +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=y CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -10266,7 +10413,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y # CONFIG_CRC4 is not set CONFIG_CRC7=y CONFIG_LIBCRC32C=y @@ -10319,7 +10466,6 @@ CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_DMA_NONCOHERENT_MMAP=y -CONFIG_DMA_REMAP=y CONFIG_DMA_CMA=y # CONFIG_DMA_PERNUMA_CMA is not set @@ -10394,10 +10540,16 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + # # Compile-time checks and compiler options # -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_INFO_NONE=y +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_DWARF5 is not set CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y # CONFIG_READABLE_ASM is not set @@ -10432,9 +10584,6 @@ CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments -CONFIG_DEBUG_KERNEL=y -CONFIG_DEBUG_MISC=y - # # Networking Debugging # diff --git a/libre/linux-libre-pck/config.i686 b/libre/linux-libre-pck/config.i686 index e458d71..5cc076a 100644 --- a/libre/linux-libre-pck/config.i686 +++ b/libre/linux-libre-pck/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8-gnu-pck1 Kernel Configuration +# Linux/x86 5.18.14-gnu-pck1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -15,8 +15,10 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_PAHOLE_VERSION=123 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -28,8 +30,8 @@ CONFIG_ZEN_INTERACTIVE=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set -CONFIG_LOCALVERSION="-zen" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -46,7 +48,7 @@ CONFIG_KERNEL_XZ=y # CONFIG_KERNEL_LZ4 is not set # CONFIG_KERNEL_ZSTD is not set CONFIG_DEFAULT_INIT="" -CONFIG_DEFAULT_HOSTNAME="archlinux" +CONFIG_DEFAULT_HOSTNAME="parabola" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -103,6 +105,7 @@ CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100 # end of Timers subsystem CONFIG_BPF=y @@ -186,6 +189,8 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y @@ -315,11 +320,9 @@ CONFIG_GENERIC_BUG=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -334,8 +337,6 @@ CONFIG_SMP=y CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y CONFIG_X86_CPU_RESCTRL=y # CONFIG_X86_BIGSMP is not set # CONFIG_X86_EXTENDED_PLATFORM is not set @@ -470,11 +471,10 @@ CONFIG_X86_16BIT=y CONFIG_X86_ESPFIX32=y CONFIG_X86_IOPL_IOPERM=y CONFIG_TOSHIBA=m -CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set # CONFIG_MICROCODE_OLD_INTERFACE is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y @@ -500,6 +500,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_X86_UMIP=y +CONFIG_CC_HAS_IBT=y # CONFIG_X86_INTEL_TSX_MODE_OFF is not set # CONFIG_X86_INTEL_TSX_MODE_ON is not set CONFIG_X86_INTEL_TSX_MODE_AUTO=y @@ -528,6 +529,14 @@ CONFIG_MODIFY_LDT_SYSCALL=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -741,7 +750,6 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_XEN=y -CONFIG_KVM_MMU_AUDIT=y CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y @@ -764,6 +772,7 @@ CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y +CONFIG_KRETPROBE_ON_RETHOOK=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -837,6 +846,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y @@ -848,12 +858,12 @@ CONFIG_LOCK_EVENT_COUNTS=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_PREEMPT_DYNAMIC=y +CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPLIT_ARG64=y CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y CONFIG_DYNAMIC_SIGFRAME=y -CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y # # GCOV-based kernel profiling @@ -894,6 +904,7 @@ CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODPROBE_PATH="/sbin/modprobe" CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y +CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG_COMMON=y @@ -946,12 +957,12 @@ CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y CONFIG_BLK_PM=y CONFIG_BLOCK_HOLDER_DEPRECATED=y +CONFIG_BLK_MQ_STACKING=y # # IO Schedulers # CONFIG_MQ_IOSCHED_DEADLINE=y -# CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set CONFIG_MQ_IOSCHED_KYBER=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y @@ -1017,6 +1028,7 @@ CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y @@ -1048,6 +1060,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_PAGE_IDLE_FLAG=y CONFIG_IDLE_PAGE_TRACKING=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ZONE_DMA=y CONFIG_HMM_MIRROR=y CONFIG_VMAP_PFN=y @@ -1069,6 +1083,7 @@ CONFIG_LRU_GEN_ENABLED=y CONFIG_DAMON=y CONFIG_DAMON_VADDR=y CONFIG_DAMON_PADDR=y +CONFIG_DAMON_SYSFS=y CONFIG_DAMON_DBGFS=y CONFIG_DAMON_RECLAIM=y # end of Data Access Monitoring @@ -1981,6 +1996,7 @@ CONFIG_RXKAD=y CONFIG_AF_KCM=m CONFIG_STREAM_PARSER=y CONFIG_MCTP=y +CONFIG_MCTP_FLOWS=y CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -2083,6 +2099,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y +# CONFIG_PAGE_POOL_STATS is not set CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y @@ -2121,6 +2138,8 @@ CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_LABEL=y +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set @@ -2176,9 +2195,11 @@ CONFIG_PCI_SW_SWITCHTEC=m # end of PCI switch controller drivers CONFIG_CXL_BUS=m -CONFIG_CXL_MEM=m +CONFIG_CXL_PCI=m # CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_CXL_ACPI=m +CONFIG_CXL_MEM=m +CONFIG_CXL_PORT=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2316,6 +2337,7 @@ CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y CONFIG_EFI_EARLYCON=y CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set # # Tegra firmware driver @@ -2443,6 +2465,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC=y CONFIG_MTD_NAND_ECC_SW_BCH=y +CONFIG_MTD_NAND_ECC_MXIC=y # end of ECC engine support # end of NAND @@ -2457,9 +2480,6 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y # CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set -CONFIG_SPI_INTEL_SPI=m -CONFIG_SPI_INTEL_SPI_PCI=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -2532,6 +2552,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m CONFIG_NVME_MULTIPATH=y +CONFIG_NVME_VERBOSE_ERRORS=y CONFIG_NVME_HWMON=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m @@ -2611,7 +2632,7 @@ CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_INTEL_MEI_ME=m -CONFIG_INTEL_MEI_TXE=m +# CONFIG_INTEL_MEI_TXE is not set CONFIG_INTEL_MEI_HDCP=m CONFIG_INTEL_MEI_PXP=m CONFIG_VMWARE_VMCI=m @@ -3095,7 +3116,10 @@ CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_REALTEK=m -CONFIG_NET_DSA_REALTEK_SMI=m +# CONFIG_NET_DSA_REALTEK_MDIO is not set +# CONFIG_NET_DSA_REALTEK_SMI is not set +CONFIG_NET_DSA_REALTEK_RTL8365MB=m +CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3187,6 +3211,8 @@ CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y # CONFIG_GEMINI_ETHERNET is not set +CONFIG_NET_VENDOR_DAVICOM=y +CONFIG_DM9051=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3220,6 +3246,9 @@ CONFIG_NET_VENDOR_EZCHIP=y # CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set CONFIG_NET_VENDOR_FUJITSU=y CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_FUNGIBLE=y +CONFIG_FUN_CORE=m +CONFIG_FUN_ETH=m CONFIG_NET_VENDOR_GOOGLE=y CONFIG_GVE=m CONFIG_NET_VENDOR_HUAWEI=y @@ -3510,6 +3539,7 @@ CONFIG_MICREL_KS8995MA=m # MCTP Device Drivers # CONFIG_MCTP_SERIAL=m +CONFIG_MCTP_TRANSPORT_I2C=m # end of MCTP Device Drivers CONFIG_MDIO_DEVICE=m @@ -3819,6 +3849,7 @@ CONFIG_MT7663S=m CONFIG_MT7921_COMMON=m CONFIG_MT7921E=m CONFIG_MT7921S=m +CONFIG_MT7921U=m CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m @@ -3880,18 +3911,25 @@ CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m CONFIG_RTW88_CORE=m CONFIG_RTW88_PCI=m +CONFIG_RTW88_USB=m CONFIG_RTW88_8822B=m CONFIG_RTW88_8822C=m +CONFIG_RTW88_8723D=m CONFIG_RTW88_8821C=m CONFIG_RTW88_8822BE=m +CONFIG_RTW88_8822BU=m CONFIG_RTW88_8822CE=m +CONFIG_RTW88_8822CU=m # CONFIG_RTW88_8723DE is not set +CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CE=m +CONFIG_RTW88_8821CU=m CONFIG_RTW88_DEBUG=y CONFIG_RTW88_DEBUGFS=y CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8852A=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_DEBUG=y CONFIG_RTW89_DEBUGMSG=y @@ -3936,13 +3974,11 @@ CONFIG_IEEE802154_AT86RF230=m CONFIG_IEEE802154_MRF24J40=m CONFIG_IEEE802154_CC2520=m CONFIG_IEEE802154_ATUSB=m -# CONFIG_IEEE802154_WPANUSB is not set CONFIG_IEEE802154_ADF7242=m CONFIG_IEEE802154_CA8210=m # CONFIG_IEEE802154_CA8210_DEBUGFS is not set CONFIG_IEEE802154_MCR20A=m CONFIG_IEEE802154_HWSIM=m -# CONFIG_IEEE802154_BCFSERIAL is not set # # Wireless WAN @@ -3994,6 +4030,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m +CONFIG_INPUT_VIVALDIFMAP=m # # Userland interfaces @@ -4173,6 +4210,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MELFAS_MIP4=m CONFIG_TOUCHSCREEN_MSG2638=m CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_IMAGIS=m # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m @@ -4404,7 +4442,6 @@ CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_I2C=y CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_TIMBERDALE is not set -# CONFIG_SERIAL_BCM63XX is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 @@ -4548,6 +4585,7 @@ CONFIG_I2C_ALGOPCA=m # # PC SMBus host controller drivers # +CONFIG_I2C_CCGX_UCSI=y CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m CONFIG_I2C_ALI15X3=m @@ -4582,6 +4620,7 @@ CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_SLAVE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_AMDPSP=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_PCI=y CONFIG_I2C_EG20T=m @@ -4651,6 +4690,9 @@ CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DLN2=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m +CONFIG_SPI_INTEL=m +CONFIG_SPI_INTEL_PCI=m +CONFIG_SPI_INTEL_PLATFORM=m CONFIG_SPI_LM70_LLP=m # CONFIG_SPI_FSL_SPI is not set # CONFIG_SPI_LANTIQ_SSC is not set @@ -4775,7 +4817,6 @@ CONFIG_GPIOLIB_IRQCHIP=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV_V1=y -# CONFIG_GPIO_OF_HELPER is not set CONFIG_GPIO_GENERIC=m CONFIG_GPIO_MAX730X=m @@ -4854,7 +4895,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m -CONFIG_GPIO_TPS68470=y +CONFIG_GPIO_TPS68470=m CONFIG_GPIO_TQMX86=m CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m @@ -4958,6 +4999,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y CONFIG_PDA_POWER=m CONFIG_GENERIC_ADC_BATTERY=m +CONFIG_IP5XXX_POWER=m CONFIG_MAX8925_POWER=m CONFIG_WM831X_BACKUP=m CONFIG_WM831X_POWER=m @@ -4971,6 +5013,7 @@ CONFIG_BATTERY_DS2780=m CONFIG_BATTERY_DS2781=m CONFIG_BATTERY_DS2782=m CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_SAMSUNG_SDI is not set CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m CONFIG_MANAGER_SBS=m @@ -5030,6 +5073,7 @@ CONFIG_CHARGER_CROS_PCHG=m CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m +CONFIG_BATTERY_UG3105=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5074,6 +5118,7 @@ CONFIG_SENSORS_DRIVETEMP=m CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_DELL_SMM=m +# CONFIG_I8K is not set CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_DA9055=m CONFIG_SENSORS_I5K_AMB=m @@ -5177,6 +5222,7 @@ CONFIG_SENSORS_IR38064_REGULATOR=y CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LM25066_REGULATOR=y CONFIG_SENSORS_LTC2978=m # CONFIG_SENSORS_LTC2978_REGULATOR is not set CONFIG_SENSORS_LTC3815=m @@ -5192,6 +5238,8 @@ CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_PIM4328=m +CONFIG_SENSORS_PLI1209BC=m +CONFIG_SENSORS_PLI1209BC_REGULATOR=y CONFIG_SENSORS_PM6764TR=m CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_Q54SJ108A2=m @@ -5201,6 +5249,7 @@ CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_XDPE122=m +CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m # CONFIG_SENSORS_PWM_FAN is not set CONFIG_SENSORS_SBTSI=m @@ -5211,6 +5260,7 @@ CONFIG_SENSORS_SHT3x=m CONFIG_SENSORS_SHT4x=m CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SY7636A=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -5238,6 +5288,7 @@ CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP108=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_TMP464=m CONFIG_SENSORS_TMP513=m CONFIG_SENSORS_VIA_CPUTEMP=m CONFIG_SENSORS_VIA686A=m @@ -5265,7 +5316,7 @@ CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ASUS_WMI=m -CONFIG_SENSORS_ASUS_WMI_EC=m +CONFIG_SENSORS_ASUS_EC=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set @@ -5305,6 +5356,7 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_TCC_COOLING=m CONFIG_INTEL_MENLOW=m +CONFIG_INTEL_HFI_THERMAL=y # end of Intel thermal drivers CONFIG_GENERIC_ADC_THERMAL=m @@ -5499,6 +5551,7 @@ CONFIG_MFD_MAX14577=m # CONFIG_MFD_MAX77650 is not set # CONFIG_MFD_MAX77686 is not set CONFIG_MFD_MAX77693=m +# CONFIG_MFD_MAX77714 is not set CONFIG_MFD_MAX77843=y CONFIG_MFD_MAX8907=m CONFIG_MFD_MAX8925=y @@ -5524,6 +5577,7 @@ CONFIG_MFD_RC5T583=y # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SIMPLE_MFD_I2C=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SKY81452=m @@ -5666,11 +5720,12 @@ CONFIG_REGULATOR_PV88060=m CONFIG_REGULATOR_PV88080=m CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m +# CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_RT5190A=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m @@ -5678,12 +5733,14 @@ CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m CONFIG_REGULATOR_SKY81452=m CONFIG_REGULATOR_SLG51000=m +CONFIG_REGULATOR_SY7636A=m # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_SY8827N is not set CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS62360=m +# CONFIG_REGULATOR_TPS6286X is not set CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m CONFIG_REGULATOR_TPS65086=m @@ -5701,46 +5758,46 @@ CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m CONFIG_RC_CORE=y -CONFIG_RC_MAP=m -CONFIG_LIRC=y CONFIG_BPF_LIRC_MODE2=y +CONFIG_LIRC=y +CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RCMM_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_SONY_DECODER=m CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_IR_RCMM_DECODER=m CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m +CONFIG_IR_FINTEK=m +# CONFIG_IR_GPIO_CIR is not set +# CONFIG_IR_GPIO_TX is not set # CONFIG_IR_HIX5HD2 is not set +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m +CONFIG_IR_MCEUSB=m CONFIG_IR_NUVOTON=m +# CONFIG_IR_PWM_TX is not set CONFIG_IR_REDRAT3=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y # CONFIG_IR_SPI is not set CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m +CONFIG_IR_TOY=m CONFIG_IR_TTUSBIR=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_ATI_REMOTE=m CONFIG_RC_LOOPBACK=m -# CONFIG_IR_GPIO_CIR is not set -# CONFIG_IR_GPIO_TX is not set -# CONFIG_IR_PWM_TX is not set -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_RC_XBOX_DVD=m -CONFIG_IR_TOY=m CONFIG_CEC_CORE=y CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y @@ -5782,7 +5839,6 @@ CONFIG_DVB_CORE=m # # Video4Linux options # -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -5822,17 +5878,17 @@ CONFIG_DVB_DYNAMIC_MINORS=y # # Drivers filtered as selected at 'Filter media drivers' # + +# +# Media drivers +# CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m @@ -5857,13 +5913,13 @@ CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SPCA500=m CONFIG_USB_GSPCA_SPCA501=m CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m @@ -5879,29 +5935,33 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_GL860=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m +CONFIG_USB_STKWEBCAM=m CONFIG_VIDEO_USBTV=m +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m # # Analog TV USB devices # +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m # # Analog/digital TV USB devices @@ -5920,34 +5980,9 @@ CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_CXUSB_ANALOG=y -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_AS102=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m @@ -5955,19 +5990,44 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_CXUSB_ANALOG=y +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_VP7045=m +CONFIG_SMS_USB_DRV=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices @@ -5991,17 +6051,19 @@ CONFIG_VIDEO_TW686X=m # # Media capture/analog TV support # +CONFIG_VIDEO_DT3155=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m # CONFIG_VIDEO_FB_IVTV is not set CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m # # Media capture/analog/hybrid TV support # +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -6015,8 +6077,6 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_ENABLE_VP3054=y CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -6027,150 +6087,202 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m +CONFIG_DVB_NETUP_UNIDVB=m CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m CONFIG_CIO2_BRIDGE=y -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_RADIO_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m +CONFIG_USB_DSBR=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_USB_MR800=m +CONFIG_USB_RAREMONO=m CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m # CONFIG_V4L_RADIO_ISA_DRIVERS is not set -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_TTPCI_EEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set -CONFIG_VIDEO_V4L2_TPG=m +CONFIG_MEDIA_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -# CONFIG_VIDEO_CADENCE is not set -CONFIG_VIDEO_ASPEED=m -# CONFIG_VIDEO_MUX is not set -# CONFIG_VIDEO_XILINX is not set +CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_DVB_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_MUX is not set # -# MMC/SDIO DVB adapters +# Allegro DVT media platform drivers # -CONFIG_SMS_SDIO_DRV=m -CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VIDEO_VIMC=m -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -CONFIG_VIDEO_VIM2M=m -CONFIG_VIDEO_VICODEC=m -CONFIG_DVB_TEST_DRIVERS=y -CONFIG_DVB_VIDTV=m # -# FireWire (IEEE 1394) Adapters +# Amlogic media platform drivers # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -# end of Media drivers -CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y +# +# Amphion drivers +# # -# Media ancillary drivers +# Aspeed media platform drivers # -CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_ASPEED=m # -# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# Atmel media platform drivers # -CONFIG_VIDEO_IR_I2C=m # -# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers' +# Cadence media platform drivers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m +# CONFIG_VIDEO_CADENCE_CSI2RX is not set +# CONFIG_VIDEO_CADENCE_CSI2TX is not set # -# Video and audio decoders +# Chips&Media media platform drivers # -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_SAA6752HS=m -CONFIG_VIDEO_M52790=m + +# +# Intel media platform drivers +# + +# +# Marvell media platform drivers +# +CONFIG_VIDEO_CAFE_CCIC=m + +# +# Mediatek media platform drivers +# + +# +# NVidia media platform drivers +# + +# +# NXP media platform drivers +# + +# +# Qualcomm media platform drivers +# + +# +# Renesas media platform drivers +# + +# +# Rockchip media platform drivers +# + +# +# Samsung media platform drivers +# + +# +# STMicroelectronics media platform drivers +# + +# +# Sunxi media platform drivers +# + +# +# Texas Instruments drivers +# + +# +# VIA media platform drivers +# +# CONFIG_VIDEO_VIA_CAMERA is not set + +# +# Xilinx media platform drivers +# +# CONFIG_VIDEO_XILINX is not set + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_DVB_TEST_DRIVERS=y +CONFIG_DVB_VIDTV=m + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_TTPCI_EEPROM=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +# end of Media drivers + +CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m # # Camera sensor devices @@ -6179,6 +6291,7 @@ CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m +CONFIG_VIDEO_HI847=m CONFIG_VIDEO_IMX208=m CONFIG_VIDEO_IMX214=m CONFIG_VIDEO_IMX219=m @@ -6190,7 +6303,22 @@ CONFIG_VIDEO_IMX319=m # CONFIG_VIDEO_IMX335 is not set CONFIG_VIDEO_IMX355=m # CONFIG_VIDEO_IMX412 is not set +CONFIG_VIDEO_MAX9271_LIB=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_OG01A1B=m CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV08D10=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_OV13B10=m CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m @@ -6200,15 +6328,15 @@ CONFIG_VIDEO_OV2685=m # CONFIG_VIDEO_OV5645 is not set CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m -CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m -CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8865=m @@ -6216,32 +6344,19 @@ CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9650=m CONFIG_VIDEO_OV9734=m -CONFIG_VIDEO_OV13858=m -CONFIG_VIDEO_OV13B10=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M001=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9M111=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9T112=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_MT9V111=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_RDACM20=m CONFIG_VIDEO_RDACM21=m CONFIG_VIDEO_RJ54N1=m -CONFIG_VIDEO_S5K6AA=m -CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5C73M3=m CONFIG_VIDEO_S5K4ECGX=m CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VS6624=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -CONFIG_VIDEO_S5C73M3=m +CONFIG_VIDEO_M5MOLS=m # end of Camera sensor devices # @@ -6263,6 +6378,41 @@ CONFIG_VIDEO_LM3646=m # end of Flash devices # +# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_SONY_BTF_MPX=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_SAA6752HS=m +CONFIG_VIDEO_M52790=m + +# # SPI I2C drivers auto-selected by 'Autoselect ancillary drivers' # @@ -6270,6 +6420,7 @@ CONFIG_VIDEO_LM3646=m # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m +CONFIG_VIDEO_GS1662=m # end of Media SPI Adapters CONFIG_MEDIA_TUNER=m @@ -6277,42 +6428,42 @@ CONFIG_MEDIA_TUNER=m # # Tuner drivers auto-selected by 'Autoselect ancillary drivers' # +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_XC5000=m # # DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers' @@ -6321,116 +6472,116 @@ CONFIG_MEDIA_TUNER_QM1D1B0004=m # # Multistandard (satellite) frontends # +CONFIG_DVB_M88DS3103=m +CONFIG_DVB_MXL5XX=m CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV0910=m CONFIG_DVB_STV6110x=m CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_TDA18271C2DD=m # # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m CONFIG_DVB_CX24123=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m +CONFIG_DVB_SI21XX=m CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0288=m CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_TDA10071=m CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP887X=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_AS102_FE=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m +CONFIG_DVB_DRXD=m CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_L64781=m +CONFIG_DVB_MT352=m +CONFIG_DVB_NXT6000=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_TDA1004X=m CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_ZL10353=m # # DVB-C (cable) frontends # -CONFIG_DVB_VES1820=m +CONFIG_DVB_STV0297=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m +CONFIG_DVB_VES1820=m # # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LG2160=m CONFIG_DVB_LGDT3305=m CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_MXL692=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_OR51211=m CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_S5H1411=m -CONFIG_DVB_MXL692=m # # ISDB-T (terrestrial) frontends # -CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_S921=m # # ISDB-S (satellite) & ISDB-T (terrestrial) frontends @@ -6447,23 +6598,23 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m +CONFIG_DVB_A8293=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_HELENE=m +CONFIG_DVB_HORUS3A=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_DRX39XYJ=m # # Common Interface (EN50221) controller drivers @@ -6492,8 +6643,6 @@ CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m CONFIG_AGP_EFFICEON=m CONFIG_INTEL_GTT=m -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=y CONFIG_DRM_MIPI_DBI=m @@ -6501,12 +6650,14 @@ CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DEBUG_MM is not set # CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_DP_HELPER=m CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m +CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_GEM_CMA_HELPER=m @@ -6620,6 +6771,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set +# CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set # CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set @@ -6650,7 +6802,6 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set -# CONFIG_DRM_PANEL_SONY_ACX424AKP is not set # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set @@ -6674,6 +6825,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CHRONTEL_CH7033 is not set # CONFIG_DRM_CROS_EC_ANX7688 is not set # CONFIG_DRM_DISPLAY_CONNECTOR is not set +# CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_LONTIUM_LT8912B is not set # CONFIG_DRM_LONTIUM_LT9611 is not set # CONFIG_DRM_LONTIUM_LT9611UXC is not set @@ -6712,6 +6864,7 @@ CONFIG_DRM_ANALOGIX_DP=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GM12U320=m +CONFIG_DRM_PANEL_MIPI_DBI=m CONFIG_DRM_SIMPLEDRM=y CONFIG_TINYDRM_HX8357D=m CONFIG_TINYDRM_ILI9163=m @@ -6724,8 +6877,16 @@ CONFIG_TINYDRM_ST7586=m CONFIG_TINYDRM_ST7735R=m CONFIG_DRM_VBOXVIDEO=m CONFIG_DRM_GUD=m +CONFIG_DRM_SSD130X=m +CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_HYPERV=m -# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_LEGACY=y +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_DRM_VIA=m +CONFIG_DRM_SAVAGE=m CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_NOMODESET=y CONFIG_DRM_PRIVACY_SCREEN=y @@ -6748,61 +6909,102 @@ CONFIG_FB_SYS_IMAGEBLIT=y # CONFIG_FB_FOREIGN_ENDIAN is not set CONFIG_FB_SYS_FOPS=y CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_HECUBA=m +CONFIG_FB_SVGALIB=m +CONFIG_FB_BACKLIGHT=m CONFIG_FB_MODE_HELPERS=y -# CONFIG_FB_TILEBLITTING is not set +CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_UVESA is not set +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +CONFIG_FB_CYBER2000_DDC=y +CONFIG_FB_ARC=m +CONFIG_FB_ASILIANT=y +CONFIG_FB_IMSTT=y +CONFIG_FB_VGA16=m +CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -# CONFIG_FB_OPENCORES is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I740 is not set +CONFIG_FB_N411=m +CONFIG_FB_HGA=m +CONFIG_FB_OPENCORES=m +CONFIG_FB_S1D13XXX=m +CONFIG_FB_NVIDIA=m +CONFIG_FB_NVIDIA_I2C=y +# CONFIG_FB_NVIDIA_DEBUG is not set +CONFIG_FB_NVIDIA_BACKLIGHT=y +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +# CONFIG_FB_RIVA_DEBUG is not set +CONFIG_FB_RIVA_BACKLIGHT=y +CONFIG_FB_I740=m CONFIG_FB_I810=m CONFIG_FB_I810_GTF=y CONFIG_FB_I810_I2C=y -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_SM501 is not set -# CONFIG_FB_SMSCUFX is not set +CONFIG_FB_LE80578=m +CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY128_BACKLIGHT=y +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +CONFIG_FB_ATY_GENERIC_LCD=y +CONFIG_FB_ATY_GX=y +CONFIG_FB_ATY_BACKLIGHT=y +CONFIG_FB_S3=m +CONFIG_FB_S3_DDC=y +CONFIG_FB_SAVAGE=m +CONFIG_FB_SAVAGE_I2C=y +CONFIG_FB_SAVAGE_ACCEL=y +CONFIG_FB_SIS=m +# CONFIG_FB_SIS_300 is not set +CONFIG_FB_SIS_315=y +CONFIG_FB_VIA=m +# CONFIG_FB_VIA_DIRECT_PROCFS is not set +CONFIG_FB_VIA_X_COMPATIBILITY=y +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_3DFX_I2C=y +CONFIG_FB_VOODOO1=m +CONFIG_FB_VT8623=m +CONFIG_FB_TRIDENT=m +CONFIG_FB_ARK=m +CONFIG_FB_PM3=m +CONFIG_FB_CARMINE=m +CONFIG_FB_CARMINE_DRAM_EVAL=y +# CONFIG_CARMINE_DRAM_CUSTOM is not set +CONFIG_FB_GEODE=y +CONFIG_FB_GEODE_LX=m +CONFIG_FB_GEODE_GX=m +CONFIG_FB_GEODE_GX1=m +CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m CONFIG_FB_UDL=m -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_HYPERV is not set -# CONFIG_FB_SSD1307 is not set -# CONFIG_FB_SM712 is not set +CONFIG_FB_IBM_GXT4500=m +CONFIG_FB_VIRTUAL=m +CONFIG_FB_METRONOME=m +CONFIG_FB_MB862XX=m +CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_MB862XX_I2C=y +CONFIG_FB_HYPERV=m +CONFIG_FB_SSD1307=m +CONFIG_FB_SM712=m # end of Frame buffer Devices # @@ -6824,6 +7026,7 @@ CONFIG_LCD_HX8357=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_KTD253=m CONFIG_BACKLIGHT_LM3533=m +# CONFIG_BACKLIGHT_CARILLO_RANCH is not set # CONFIG_BACKLIGHT_PWM is not set CONFIG_BACKLIGHT_DA903X=m CONFIG_BACKLIGHT_DA9052=m @@ -6855,6 +7058,7 @@ CONFIG_BACKLIGHT_ARCXCNN=m # end of Backlight & LCD device support CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y CONFIG_HDMI=y # @@ -7147,8 +7351,10 @@ CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_AMD_ACP_CONFIG=m CONFIG_SND_SOC_AMD_ACP_COMMON=m +CONFIG_SND_SOC_AMD_ACP_PDM=m CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_PCM=m +CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m @@ -7206,10 +7412,13 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -7249,6 +7458,7 @@ CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m # CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_MTK_BTCVSD=m @@ -7258,7 +7468,8 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_ACPI=m CONFIG_SND_SOC_SOF_ACPI_DEV=m # CONFIG_SND_SOC_SOF_OF is not set -# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set +CONFIG_SND_SOC_SOF_DEBUG_PROBES=m +CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m @@ -7290,6 +7501,7 @@ CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m CONFIG_SND_SOC_SOF_HDA=m +CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m CONFIG_SND_SOC_SOF_XTENSA=m @@ -7334,6 +7546,7 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_ALC5623=m +CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CROS_EC_CODEC=m @@ -7475,6 +7688,7 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m CONFIG_SND_SOC_TFA9879=m @@ -7539,6 +7753,7 @@ CONFIG_SND_SOC_NAU8822=m CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_LPASS_MACRO_COMMON=m CONFIG_SND_SOC_LPASS_WSA_MACRO=m CONFIG_SND_SOC_LPASS_VA_MACRO=m CONFIG_SND_SOC_LPASS_RX_MACRO=m @@ -7602,6 +7817,7 @@ CONFIG_HID_GFRM=m CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_VIVALDI_COMMON=m CONFIG_HID_GOOGLE_HAMMER=m CONFIG_HID_VIVALDI=m CONFIG_HID_GT683R=m @@ -7653,12 +7869,14 @@ CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLAYSTATION=m CONFIG_PLAYSTATION_FF=y +CONFIG_HID_RAZER=m CONFIG_HID_PRIMAX=m CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SEMITEK=m +CONFIG_HID_SIGMAMICRO=m CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m @@ -8109,8 +8327,10 @@ CONFIG_TYPEC_UCSI=m CONFIG_UCSI_CCG=m CONFIG_UCSI_ACPI=m CONFIG_TYPEC_TPS6598X=m +CONFIG_TYPEC_RT1719=m CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC_STUSB160X=m +CONFIG_TYPEC_WUSB3801=m # # USB Type-C Multiplexer/DeMultiplexer Switch support @@ -8598,9 +8818,11 @@ CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y +CONFIG_MLX5_VFIO_PCI=m CONFIG_VFIO_MDEV=m CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y +CONFIG_VMGENID=y CONFIG_VBOXGUEST=m CONFIG_NITRO_ENCLAVES=m CONFIG_VIRTIO=y @@ -8677,7 +8899,6 @@ CONFIG_ADIS16240=m # Analog to digital converters # CONFIG_AD7816=m -CONFIG_AD7280=m # end of Analog to digital converters # @@ -8733,19 +8954,11 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_SP8870=m - -# -# Android -# -CONFIG_ASHMEM=y -# end of Android - # CONFIG_STAGING_BOARD is not set CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m CONFIG_FWTTY_MAX_TOTAL_PORTS=64 CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_GS_FPGABOOT=m CONFIG_UNISYSSPAR=y # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_FB_TFT is not set @@ -8824,7 +9037,6 @@ CONFIG_INTEL_ATOMISP2_PDX86=y CONFIG_INTEL_ATOMISP2_LED=m CONFIG_INTEL_ATOMISP2_PM=m CONFIG_INTEL_SAR_INT1092=m -CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_SKL_INT3472=m CONFIG_INTEL_PMC_CORE=y CONFIG_INTEL_PMT_CLASS=m @@ -8838,6 +9050,7 @@ CONFIG_INTEL_VBTN=m CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_INTEL_CHTWC_INT33FE=m CONFIG_INTEL_PUNIT_IPC=m CONFIG_INTEL_RST=m CONFIG_INTEL_SMARTCONNECT=m @@ -8862,7 +9075,7 @@ CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m -CONFIG_I2C_MULTI_INSTANTIATE=m +CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m CONFIG_TOUCHSCREEN_DMI=y CONFIG_X86_ANDROID_TABLETS=m @@ -8892,6 +9105,7 @@ CONFIG_CROS_EC_SYSFS=m CONFIG_CROS_EC_TYPEC=m CONFIG_CROS_USBPD_LOGGER=m CONFIG_CROS_USBPD_NOTIFY=m +CONFIG_CHROMEOS_PRIVACY_SCREEN=m CONFIG_WILCO_EC=m CONFIG_WILCO_EC_DEBUGFS=m CONFIG_WILCO_EC_EVENTS=m @@ -8903,7 +9117,6 @@ CONFIG_MLXREG_LC=m CONFIG_OLPC_EC=y CONFIG_SURFACE_PLATFORMS=y CONFIG_SURFACE3_WMI=m -CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE_ACPI_NOTIFY=m CONFIG_SURFACE_AGGREGATOR_CDEV=m @@ -8931,11 +9144,11 @@ CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_TPS68470=m # CONFIG_COMMON_CLK_CDCE925 is not set CONFIG_COMMON_CLK_CS2000_CP=m -# CONFIG_COMMON_CLK_LAN966X is not set CONFIG_CLK_TWL6040=m # CONFIG_COMMON_CLK_AXI_CLKGEN is not set CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set # CONFIG_CLK_LGM_CGU is not set @@ -8993,6 +9206,7 @@ CONFIG_REMOTEPROC_CDEV=y # CONFIG_RPMSG=m CONFIG_RPMSG_CHAR=m +CONFIG_RPMSG_CTRL=m CONFIG_RPMSG_NS=m CONFIG_RPMSG_QCOM_GLINK=m CONFIG_RPMSG_QCOM_GLINK_RPM=m @@ -9119,6 +9333,9 @@ CONFIG_ADXL313_SPI=m CONFIG_ADXL355=m CONFIG_ADXL355_I2C=m CONFIG_ADXL355_SPI=m +CONFIG_ADXL367=m +CONFIG_ADXL367_SPI=m +CONFIG_ADXL367_I2C=m CONFIG_ADXL372=m CONFIG_ADXL372_SPI=m CONFIG_ADXL372_I2C=m @@ -9173,6 +9390,7 @@ CONFIG_AD7091R5=m CONFIG_AD7124=m CONFIG_AD7192=m CONFIG_AD7266=m +CONFIG_AD7280=m CONFIG_AD7291=m CONFIG_AD7292=m CONFIG_AD7298=m @@ -9256,6 +9474,7 @@ CONFIG_AD74413R=m # Amplifiers # CONFIG_AD8366=m +CONFIG_ADA4250=m CONFIG_HMC425=m # end of Amplifiers @@ -9333,6 +9552,7 @@ CONFIG_AD5592R=m CONFIG_AD5593R=m CONFIG_AD5504=m CONFIG_AD5624R_SPI=m +CONFIG_LTC2688=m # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set CONFIG_AD5755=m @@ -9388,6 +9608,7 @@ CONFIG_AD9523=m CONFIG_ADF4350=m CONFIG_ADF4371=m CONFIG_ADMV1013=m +CONFIG_ADMV4420=m CONFIG_ADRF6780=m # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -9658,7 +9879,10 @@ CONFIG_MB1232=m CONFIG_PING=m CONFIG_RFD77402=m CONFIG_SRF04=m +CONFIG_SX_COMMON=m # CONFIG_SX9310 is not set +CONFIG_SX9324=m +CONFIG_SX9360=m CONFIG_SX9500=m CONFIG_SRF08=m # CONFIG_VCNL3020 is not set @@ -9748,11 +9972,9 @@ CONFIG_BCM_KONA_USB2_PHY=m # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set +# CONFIG_PHY_CADENCE_DPHY_RX is not set # CONFIG_PHY_CADENCE_SIERRA is not set # CONFIG_PHY_CADENCE_SALVO is not set -# CONFIG_PHY_FSL_IMX8MQ_USB is not set -# CONFIG_PHY_MIXEL_MIPI_DPHY is not set -# CONFIG_PHY_FSL_IMX8M_PCIE is not set CONFIG_PHY_PXA_28NM_HSIC=m CONFIG_PHY_PXA_28NM_USB2=m # CONFIG_PHY_LAN966X_SERDES is not set @@ -9771,8 +9993,7 @@ CONFIG_POWERCAP=y CONFIG_INTEL_RAPL_CORE=m CONFIG_INTEL_RAPL=m CONFIG_IDLE_INJECT=y -CONFIG_DTPM=y -CONFIG_DTPM_CPU=y +# CONFIG_DTPM is not set CONFIG_MCB=m CONFIG_MCB_PCI=m CONFIG_MCB_LPC=m @@ -9881,6 +10102,7 @@ CONFIG_MOST=m CONFIG_MOST_USB_HDM=m CONFIG_MOST_CDEV=m CONFIG_MOST_SND=m +# CONFIG_PECI is not set # end of Device Drivers # @@ -9949,8 +10171,8 @@ CONFIG_F2FS_FS_LZ4=y CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y +CONFIG_F2FS_UNFAIR_RWSEM=y CONFIG_ZONEFS_FS=m -CONFIG_FS_DAX=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y @@ -9978,7 +10200,6 @@ CONFIG_AUTOFS_FS=y CONFIG_FUSE_FS=m CONFIG_CUSE=m CONFIG_VIRTIO_FS=m -CONFIG_FUSE_DAX=y CONFIG_OVERLAY_FS=m CONFIG_OVERLAY_FS_REDIRECT_DIR=y # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set @@ -10175,7 +10396,7 @@ CONFIG_NFS_V4_2=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_FLEXFILE_LAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_V4_1_MIGRATION=y CONFIG_NFS_V4_SECURITY_LABEL=y CONFIG_NFS_FSCACHE=y @@ -10186,7 +10407,6 @@ CONFIG_NFS_DEBUG=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -10306,6 +10526,7 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m +# CONFIG_USER_DECRYPTED_DATA is not set CONFIG_KEY_DH_OPERATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y @@ -10353,14 +10574,24 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set CONFIG_SECURITY_LANDLOCK=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_PLATFORM_KEYRING=y +CONFIG_INTEGRITY_MACHINE_KEYRING=y +CONFIG_LOAD_UEFI_KEYS=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="landlock,lockdown,yama,bpf" +CONFIG_LSM="landlock,lockdown,yama,integrity,bpf" # # Kernel hardening options @@ -10371,9 +10602,9 @@ CONFIG_LSM="landlock,lockdown,yama,bpf" # CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set +CONFIG_INIT_STACK_NONE=y # CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y +# CONFIG_INIT_STACK_ALL_ZERO is not set # CONFIG_GCC_PLUGIN_STACKLEAK is not set CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -10429,6 +10660,7 @@ CONFIG_CRYPTO_ENGINE=m # CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_ECC=y CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDSA=y @@ -10482,6 +10714,7 @@ CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_MD4=m @@ -10579,10 +10812,8 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS8_PRIVATE_KEY_PARSER=m -CONFIG_TPM_KEY_PARSER=m CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y @@ -10640,12 +10871,15 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -10653,7 +10887,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m @@ -10734,6 +10968,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y +CONFIG_SIGNATURE=y CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y @@ -10786,18 +11021,24 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_MISC is not set + # # Compile-time checks and compiler options # CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_NONE is not set +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +CONFIG_DEBUG_INFO_DWARF5=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_SPLIT is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set -CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_BTF=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=1024 CONFIG_STRIP_ASM_SYMS=y @@ -10827,9 +11068,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_MISC is not set - # # Networking Debugging # @@ -10877,6 +11115,7 @@ CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=100 CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_DEFERRABLE=y CONFIG_KFENCE_STRESS_TEST_FAULTS=0 # end of Memory Debugging @@ -10967,6 +11206,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_LATENCYTOP=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_RETHOOK=y +CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -10993,6 +11234,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_FPROBE=y CONFIG_FUNCTION_PROFILER=y CONFIG_STACK_TRACER=y # CONFIG_IRQSOFF_TRACER is not set @@ -11096,7 +11338,6 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set # CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_IDA is not set @@ -11115,7 +11356,6 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_KMOD is not set # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_FPU is not set diff --git a/libre/linux-libre-pck/config.x86_64 b/libre/linux-libre-pck/config.x86_64 index b3ffa9e..203a5a8 100644 --- a/libre/linux-libre-pck/config.x86_64 +++ b/libre/linux-libre-pck/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.8-gnu-pck1 Kernel Configuration +# Linux/x86 5.18.14-gnu-pck1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -15,8 +15,10 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_PAHOLE_VERSION=123 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -104,6 +106,7 @@ CONFIG_NO_HZ_IDLE=y # CONFIG_NO_HZ_FULL is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100 # end of Timers subsystem CONFIG_BPF=y @@ -196,6 +199,8 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_NUMA_BALANCING=y CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -331,11 +336,9 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_NR_GPIO=1024 CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_AUDIT_ARCH=y CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_64_SMP=y @@ -353,9 +356,6 @@ CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=y -CONFIG_CC_HAS_SLS=y -CONFIG_SLS=y CONFIG_X86_CPU_RESCTRL=y # CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_X86_INTEL_LPSS=y @@ -481,7 +481,6 @@ CONFIG_X86_16BIT=y CONFIG_X86_ESPFIX64=y CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_X86_IOPL_IOPERM=y -CONFIG_I8K=m CONFIG_MICROCODE=y # CONFIG_MICROCODE_INTEL is not set # CONFIG_MICROCODE_AMD is not set @@ -501,7 +500,6 @@ CONFIG_X86_64_ACPI_NUMA=y CONFIG_NODES_SHIFT=5 CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y # CONFIG_ARCH_MEMORY_PROBE is not set CONFIG_ARCH_PROC_KCORE_TEXT=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 @@ -518,6 +516,8 @@ CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y CONFIG_X86_UMIP=y +CONFIG_CC_HAS_IBT=y +CONFIG_X86_KERNEL_IBT=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y # CONFIG_X86_INTEL_TSX_MODE_OFF is not set # CONFIG_X86_INTEL_TSX_MODE_ON is not set @@ -535,7 +535,9 @@ CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_ARCH_HAS_KEXEC_PURGATORY=y -# CONFIG_KEXEC_SIG is not set +CONFIG_KEXEC_SIG=y +# CONFIG_KEXEC_SIG_FORCE is not set +CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_CRASH_DUMP=y CONFIG_KEXEC_JUMP=y CONFIG_PHYSICAL_START=0x1000000 @@ -560,6 +562,16 @@ CONFIG_HAVE_LIVEPATCH=y # CONFIG_LIVEPATCH is not set # end of Processor type and features +CONFIG_CC_HAS_SLS=y +CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_PAGE_TABLE_ISOLATION=y +CONFIG_RETPOLINE=y +CONFIG_RETHUNK=y +CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CPU_IBPB_ENTRY=y +CONFIG_CPU_IBRS_ENTRY=y +CONFIG_SLS=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -729,7 +741,7 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_X86_X32 is not set +# CONFIG_X86_X32_ABI is not set CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y @@ -761,7 +773,6 @@ CONFIG_X86_SGX_KVM=y CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y CONFIG_KVM_XEN=y -CONFIG_KVM_MMU_AUDIT=y CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y @@ -785,6 +796,7 @@ CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_KRETPROBES=y +CONFIG_KRETPROBE_ON_RETHOOK=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -847,6 +859,7 @@ CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_ARCH_HUGE_VMALLOC=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y @@ -871,6 +884,7 @@ CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +CONFIG_RANDOMIZE_KSTACK_OFFSET=y CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y @@ -884,6 +898,7 @@ CONFIG_ARCH_HAS_CC_PLATFORM=y CONFIG_HAVE_STATIC_CALL=y CONFIG_HAVE_STATIC_CALL_INLINE=y CONFIG_HAVE_PREEMPT_DYNAMIC=y +CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y @@ -932,6 +947,7 @@ CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODPROBE_PATH="/sbin/modprobe" CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y +CONFIG_BLOCK_LEGACY_AUTOLOAD=y CONFIG_BLK_RQ_ALLOC_TIME=y CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG_COMMON=y @@ -986,12 +1002,12 @@ CONFIG_BLK_MQ_VIRTIO=y CONFIG_BLK_MQ_RDMA=y CONFIG_BLK_PM=y CONFIG_BLOCK_HOLDER_DEPRECATED=y +CONFIG_BLK_MQ_STACKING=y # # IO Schedulers # CONFIG_MQ_IOSCHED_DEADLINE=y -# CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set CONFIG_MQ_IOSCHED_KYBER=y CONFIG_IOSCHED_BFQ=y CONFIG_BFQ_GROUP_IOSCHED=y @@ -1030,8 +1046,6 @@ CONFIG_COREDUMP=y # # Memory Management options # -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y @@ -1054,6 +1068,7 @@ CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y +CONFIG_DEVICE_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y @@ -1070,6 +1085,7 @@ CONFIG_HWPOISON_INJECT=m CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANTS_THP_SWAP=y CONFIG_THP_SWAP=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y @@ -1106,11 +1122,12 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_PAGE_IDLE_FLAG=y CONFIG_IDLE_PAGE_TRACKING=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y +CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_ZONE_DMA=y CONFIG_ZONE_DMA32=y CONFIG_ZONE_DEVICE=y -CONFIG_DEV_PAGEMAP_OPS=y CONFIG_HMM_MIRROR=y CONFIG_DEVICE_PRIVATE=y CONFIG_VMAP_PFN=y @@ -1133,6 +1150,7 @@ CONFIG_LRU_GEN_ENABLED=y CONFIG_DAMON=y CONFIG_DAMON_VADDR=y CONFIG_DAMON_PADDR=y +CONFIG_DAMON_SYSFS=y CONFIG_DAMON_DBGFS=y CONFIG_DAMON_RECLAIM=y # end of Data Access Monitoring @@ -2039,6 +2057,7 @@ CONFIG_RXKAD=y CONFIG_AF_KCM=m CONFIG_STREAM_PARSER=y CONFIG_MCTP=y +CONFIG_MCTP_FLOWS=y CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_WIRELESS_EXT=y @@ -2143,6 +2162,7 @@ CONFIG_NET_SELFTESTS=m CONFIG_NET_SOCK_MSG=y CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y +# CONFIG_PAGE_POOL_STATS is not set CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y @@ -2184,6 +2204,8 @@ CONFIG_PCI_PASID=y CONFIG_PCI_P2PDMA=y CONFIG_PCI_LABEL=y CONFIG_PCI_HYPERV=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_HOTPLUG_PCI_ACPI_IBM=m @@ -2232,10 +2254,12 @@ CONFIG_PCI_SW_SWITCHTEC=m # end of PCI switch controller drivers CONFIG_CXL_BUS=m -CONFIG_CXL_MEM=m +CONFIG_CXL_PCI=m # CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_CXL_ACPI=m CONFIG_CXL_PMEM=m +CONFIG_CXL_MEM=m +CONFIG_CXL_PORT=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2371,6 +2395,7 @@ CONFIG_UEFI_CPER_X86=y CONFIG_EFI_DEV_PATH_PARSER=y CONFIG_EFI_EARLYCON=y CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_EFI_DISABLE_RUNTIME is not set # # Tegra firmware driver @@ -2493,6 +2518,7 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC=y CONFIG_MTD_NAND_ECC_SW_BCH=y +CONFIG_MTD_NAND_ECC_MXIC=y # end of ECC engine support # end of NAND @@ -2507,9 +2533,6 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y # CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y # CONFIG_MTD_SPI_NOR_SWP_KEEP is not set -CONFIG_SPI_INTEL_SPI=m -CONFIG_SPI_INTEL_SPI_PCI=m -CONFIG_SPI_INTEL_SPI_PLATFORM=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -2579,6 +2602,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m CONFIG_NVME_CORE=m CONFIG_BLK_DEV_NVME=m CONFIG_NVME_MULTIPATH=y +CONFIG_NVME_VERBOSE_ERRORS=y CONFIG_NVME_HWMON=y CONFIG_NVME_FABRICS=m CONFIG_NVME_RDMA=m @@ -3125,6 +3149,10 @@ CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_REALTEK=m +# CONFIG_NET_DSA_REALTEK_MDIO is not set +# CONFIG_NET_DSA_REALTEK_SMI is not set +CONFIG_NET_DSA_REALTEK_RTL8365MB=m +CONFIG_NET_DSA_REALTEK_RTL8366RB=m CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m @@ -3217,6 +3245,8 @@ CONFIG_CHELSIO_TLS_DEVICE=m CONFIG_NET_VENDOR_CISCO=y CONFIG_ENIC=m CONFIG_NET_VENDOR_CORTINA=y +CONFIG_NET_VENDOR_DAVICOM=y +CONFIG_DM9051=m CONFIG_DNET=m CONFIG_NET_VENDOR_DEC=y CONFIG_NET_TULIP=y @@ -3249,6 +3279,9 @@ CONFIG_TSNEP=m CONFIG_NET_VENDOR_EZCHIP=y CONFIG_NET_VENDOR_FUJITSU=y CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_FUNGIBLE=y +CONFIG_FUN_CORE=m +CONFIG_FUN_ETH=m CONFIG_NET_VENDOR_GOOGLE=y CONFIG_GVE=m CONFIG_NET_VENDOR_HUAWEI=y @@ -3536,6 +3569,7 @@ CONFIG_MICREL_KS8995MA=m # MCTP Device Drivers # CONFIG_MCTP_SERIAL=m +CONFIG_MCTP_TRANSPORT_I2C=m # end of MCTP Device Drivers CONFIG_MDIO_DEVICE=m @@ -3840,6 +3874,7 @@ CONFIG_MT7915E=m CONFIG_MT7921_COMMON=m CONFIG_MT7921E=m CONFIG_MT7921S=m +CONFIG_MT7921U=m CONFIG_WLAN_VENDOR_MICROCHIP=y CONFIG_WILC1000=m CONFIG_WILC1000_SDIO=m @@ -3901,19 +3936,25 @@ CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW88=m CONFIG_RTW88_CORE=m CONFIG_RTW88_PCI=m +CONFIG_RTW88_USB=m CONFIG_RTW88_8822B=m CONFIG_RTW88_8822C=m CONFIG_RTW88_8723D=m CONFIG_RTW88_8821C=m CONFIG_RTW88_8822BE=m +CONFIG_RTW88_8822BU=m CONFIG_RTW88_8822CE=m +CONFIG_RTW88_8822CU=m CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CE=m +CONFIG_RTW88_8821CU=m CONFIG_RTW88_DEBUG=y CONFIG_RTW88_DEBUGFS=y CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8852A=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_DEBUG=y CONFIG_RTW89_DEBUGMSG=y @@ -3957,13 +3998,11 @@ CONFIG_IEEE802154_AT86RF230=m CONFIG_IEEE802154_MRF24J40=m CONFIG_IEEE802154_CC2520=m CONFIG_IEEE802154_ATUSB=m -# CONFIG_IEEE802154_WPANUSB is not set CONFIG_IEEE802154_ADF7242=m CONFIG_IEEE802154_CA8210=m # CONFIG_IEEE802154_CA8210_DEBUGFS is not set CONFIG_IEEE802154_MCR20A=m CONFIG_IEEE802154_HWSIM=m -# CONFIG_IEEE802154_BCFSERIAL is not set # # Wireless WAN @@ -4016,6 +4055,7 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_MATRIXKMAP=m +CONFIG_INPUT_VIVALDIFMAP=m # # Userland interfaces @@ -4185,6 +4225,7 @@ CONFIG_TOUCHSCREEN_MMS114=m CONFIG_TOUCHSCREEN_MELFAS_MIP4=m CONFIG_TOUCHSCREEN_MSG2638=m CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_IMAGIS=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m @@ -4403,7 +4444,6 @@ CONFIG_SERIAL_SC16IS7XX_CORE=m CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_I2C=y CONFIG_SERIAL_SC16IS7XX_SPI=y -# CONFIG_SERIAL_BCM63XX is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 @@ -4537,6 +4577,7 @@ CONFIG_I2C_ALGOPCA=m # # PC SMBus host controller drivers # +CONFIG_I2C_CCGX_UCSI=y CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m CONFIG_I2C_ALI15X3=m @@ -4571,6 +4612,7 @@ CONFIG_I2C_CBUS_GPIO=m CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_SLAVE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_AMDPSP=y CONFIG_I2C_DESIGNWARE_BAYTRAIL=y CONFIG_I2C_DESIGNWARE_PCI=y CONFIG_I2C_EMEV2=m @@ -4634,6 +4676,9 @@ CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DLN2=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m +CONFIG_SPI_INTEL=m +CONFIG_SPI_INTEL_PCI=m +CONFIG_SPI_INTEL_PLATFORM=m CONFIG_SPI_LM70_LLP=m # CONFIG_SPI_LANTIQ_SSC is not set CONFIG_SPI_OC_TINY=m @@ -4810,7 +4855,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS6586X=y CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m -CONFIG_GPIO_TPS68470=y +CONFIG_GPIO_TPS68470=m CONFIG_GPIO_TQMX86=m CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m @@ -4904,6 +4949,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y CONFIG_PDA_POWER=m CONFIG_GENERIC_ADC_BATTERY=m +CONFIG_IP5XXX_POWER=m CONFIG_MAX8925_POWER=m CONFIG_WM831X_BACKUP=m CONFIG_WM831X_POWER=m @@ -4916,6 +4962,7 @@ CONFIG_BATTERY_DS2760=m CONFIG_BATTERY_DS2780=m CONFIG_BATTERY_DS2781=m CONFIG_BATTERY_DS2782=m +# CONFIG_BATTERY_SAMSUNG_SDI is not set CONFIG_BATTERY_SBS=m CONFIG_CHARGER_SBS=m CONFIG_MANAGER_SBS=m @@ -4975,6 +5022,7 @@ CONFIG_CHARGER_BD99954=m CONFIG_CHARGER_WILCO=m CONFIG_BATTERY_SURFACE=m CONFIG_CHARGER_SURFACE=m +CONFIG_BATTERY_UG3105=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -5019,6 +5067,7 @@ CONFIG_SENSORS_DRIVETEMP=m CONFIG_SENSORS_DS620=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_DELL_SMM=m +# CONFIG_I8K is not set CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_DA9055=m CONFIG_SENSORS_I5K_AMB=m @@ -5121,6 +5170,7 @@ CONFIG_SENSORS_IR38064_REGULATOR=y CONFIG_SENSORS_IRPS5401=m CONFIG_SENSORS_ISL68137=m CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LM25066_REGULATOR=y CONFIG_SENSORS_LTC2978=m # CONFIG_SENSORS_LTC2978_REGULATOR is not set CONFIG_SENSORS_LTC3815=m @@ -5136,6 +5186,8 @@ CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_PIM4328=m +CONFIG_SENSORS_PLI1209BC=m +CONFIG_SENSORS_PLI1209BC_REGULATOR=y CONFIG_SENSORS_PM6764TR=m CONFIG_SENSORS_PXE1610=m CONFIG_SENSORS_Q54SJ108A2=m @@ -5145,6 +5197,7 @@ CONFIG_SENSORS_TPS53679=m CONFIG_SENSORS_UCD9000=m CONFIG_SENSORS_UCD9200=m CONFIG_SENSORS_XDPE122=m +CONFIG_SENSORS_XDPE122_REGULATOR=y CONFIG_SENSORS_ZL6100=m CONFIG_SENSORS_SBTSI=m CONFIG_SENSORS_SBRMI=m @@ -5154,6 +5207,7 @@ CONFIG_SENSORS_SHT3x=m CONFIG_SENSORS_SHT4x=m CONFIG_SENSORS_SHTC1=m CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SY7636A=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_EMC1403=m CONFIG_SENSORS_EMC2103=m @@ -5181,6 +5235,7 @@ CONFIG_SENSORS_TMP103=m CONFIG_SENSORS_TMP108=m CONFIG_SENSORS_TMP401=m CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_TMP464=m CONFIG_SENSORS_TMP513=m CONFIG_SENSORS_VIA_CPUTEMP=m CONFIG_SENSORS_VIA686A=m @@ -5208,7 +5263,7 @@ CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ASUS_WMI=m -CONFIG_SENSORS_ASUS_WMI_EC=m +CONFIG_SENSORS_ASUS_EC=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set @@ -5249,6 +5304,7 @@ CONFIG_INTEL_BXT_PMIC_THERMAL=m CONFIG_INTEL_PCH_THERMAL=m CONFIG_INTEL_TCC_COOLING=m CONFIG_INTEL_MENLOW=m +CONFIG_INTEL_HFI_THERMAL=y # end of Intel thermal drivers CONFIG_GENERIC_ADC_THERMAL=m @@ -5445,6 +5501,7 @@ CONFIG_MFD_RT4831=m CONFIG_MFD_RT5033=m CONFIG_MFD_RC5T583=y CONFIG_MFD_SI476X_CORE=m +CONFIG_MFD_SIMPLE_MFD_I2C=m CONFIG_MFD_SM501=m CONFIG_MFD_SM501_GPIO=y CONFIG_MFD_SKY81452=m @@ -5561,11 +5618,11 @@ CONFIG_REGULATOR_PV88060=m CONFIG_REGULATOR_PV88080=m CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=m -CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4831=m CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_RT5190A=m CONFIG_REGULATOR_RT6160=m CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m @@ -5573,6 +5630,7 @@ CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m CONFIG_REGULATOR_SKY81452=m CONFIG_REGULATOR_SLG51000=m +CONFIG_REGULATOR_SY7636A=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS62360=m @@ -5592,41 +5650,41 @@ CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_WM8994=m CONFIG_RC_CORE=y -CONFIG_RC_MAP=m -CONFIG_LIRC=y CONFIG_BPF_LIRC_MODE2=y +CONFIG_LIRC=y +CONFIG_RC_MAP=m CONFIG_RC_DECODERS=y +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_NEC_DECODER=m CONFIG_IR_RC5_DECODER=m CONFIG_IR_RC6_DECODER=m -CONFIG_IR_JVC_DECODER=m -CONFIG_IR_SONY_DECODER=m +CONFIG_IR_RCMM_DECODER=m CONFIG_IR_SANYO_DECODER=m CONFIG_IR_SHARP_DECODER=m -CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_SONY_DECODER=m CONFIG_IR_XMP_DECODER=m -CONFIG_IR_IMON_DECODER=m -CONFIG_IR_RCMM_DECODER=m CONFIG_RC_DEVICES=y -CONFIG_RC_ATI_REMOTE=m CONFIG_IR_ENE=m +CONFIG_IR_FINTEK=m +CONFIG_IR_IGORPLUGUSB=m +CONFIG_IR_IGUANA=m CONFIG_IR_IMON=m CONFIG_IR_IMON_RAW=m -CONFIG_IR_MCEUSB=m CONFIG_IR_ITE_CIR=m -CONFIG_IR_FINTEK=m +CONFIG_IR_MCEUSB=m CONFIG_IR_NUVOTON=m CONFIG_IR_REDRAT3=m +CONFIG_IR_SERIAL=m +CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_IR_STREAMZAP=m -CONFIG_IR_WINBOND_CIR=m -CONFIG_IR_IGORPLUGUSB=m -CONFIG_IR_IGUANA=m +CONFIG_IR_TOY=m CONFIG_IR_TTUSBIR=m +CONFIG_IR_WINBOND_CIR=m +CONFIG_RC_ATI_REMOTE=m CONFIG_RC_LOOPBACK=m -CONFIG_IR_SERIAL=m -CONFIG_IR_SERIAL_TRANSMITTER=y CONFIG_RC_XBOX_DVD=m -CONFIG_IR_TOY=m CONFIG_CEC_CORE=y CONFIG_CEC_NOTIFIER=y CONFIG_CEC_PIN=y @@ -5669,7 +5727,6 @@ CONFIG_DVB_CORE=m # # Video4Linux options # -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -5709,17 +5766,17 @@ CONFIG_DVB_DYNAMIC_MINORS=y # # Drivers filtered as selected at 'Filter media drivers' # + +# +# Media drivers +# CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GL860=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_CPIA1=m @@ -5744,13 +5801,13 @@ CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m CONFIG_USB_GSPCA_SONIXJ=m +CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SPCA500=m CONFIG_USB_GSPCA_SPCA501=m CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SPCA1528=m CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m @@ -5766,29 +5823,33 @@ CONFIG_USB_GSPCA_VC032X=m CONFIG_USB_GSPCA_VICAM=m CONFIG_USB_GSPCA_XIRLINK_CIT=m CONFIG_USB_GSPCA_ZC3XX=m +CONFIG_USB_GL860=m +CONFIG_USB_M5602=m +CONFIG_USB_STV06XX=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_VIDEO_CPIA2=m -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m +CONFIG_USB_STKWEBCAM=m CONFIG_VIDEO_USBTV=m +CONFIG_USB_VIDEO_CLASS=m +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y +CONFIG_USB_ZR364XX=m # # Analog TV USB devices # +CONFIG_VIDEO_GO7007=m +CONFIG_VIDEO_GO7007_USB=m +CONFIG_VIDEO_GO7007_LOADER=m +CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m +CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_GO7007=m -CONFIG_VIDEO_GO7007_USB=m -CONFIG_VIDEO_GO7007_LOADER=m -CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m # # Analog/digital TV USB devices @@ -5807,34 +5868,9 @@ CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices # -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_DIB3000MC=m -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_CXUSB_ANALOG=y -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_PCTV452E=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AZ6027=m -CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_AS102=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set CONFIG_DVB_USB_V2=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_AF9035=m @@ -5842,19 +5878,44 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_AU6610=m CONFIG_DVB_USB_AZ6007=m CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_EC168=m CONFIG_DVB_USB_GL861=m CONFIG_DVB_USB_LME2510=m CONFIG_DVB_USB_MXL111SF=m CONFIG_DVB_USB_RTL28XXU=m -CONFIG_DVB_USB_DVBSKY=m CONFIG_DVB_USB_ZD1301=m +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_CXUSB_ANALOG=y +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_DIB3000MC=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_PCTV452E=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_VP7045=m +CONFIG_SMS_USB_DRV=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m -CONFIG_SMS_USB_DRV=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set -CONFIG_DVB_AS102=m # # Webcam, TV (analog/digital) USB devices @@ -5878,17 +5939,19 @@ CONFIG_VIDEO_TW686X=m # # Media capture/analog TV support # +CONFIG_VIDEO_DT3155=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m # CONFIG_VIDEO_FB_IVTV is not set CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_DT3155=m # # Media capture/analog/hybrid TV support # +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_CX23885=m @@ -5902,8 +5965,6 @@ CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_ENABLE_VP3054=y CONFIG_VIDEO_CX88_VP3054=m CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_BT848=m -CONFIG_DVB_BT8XX=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_RC=y @@ -5914,149 +5975,198 @@ CONFIG_VIDEO_SAA7164=m # # Media digital TV PCI Adapters # -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set -CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set CONFIG_DVB_DM1105=m -CONFIG_DVB_PT1=m -CONFIG_DVB_PT3=m CONFIG_MANTIS_CORE=m CONFIG_DVB_MANTIS=m CONFIG_DVB_HOPPER=m +CONFIG_DVB_NETUP_UNIDVB=m CONFIG_DVB_NGENE=m -CONFIG_DVB_DDBRIDGE=m -# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_PT1=m +CONFIG_DVB_PT3=m CONFIG_DVB_SMIPCIE=m -CONFIG_DVB_NETUP_UNIDVB=m +CONFIG_DVB_BUDGET_CORE=m +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m CONFIG_CIO2_BRIDGE=y -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_RADIO_SI4713=m +CONFIG_RADIO_SI476X=m CONFIG_RADIO_TEA575X=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m +CONFIG_USB_DSBR=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_USB_MR800=m +CONFIG_USB_RAREMONO=m CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI4713=m CONFIG_USB_SI4713=m CONFIG_PLATFORM_SI4713=m CONFIG_I2C_SI4713=m -CONFIG_RADIO_SI476X=m -CONFIG_USB_MR800=m -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_SHARK=m -CONFIG_RADIO_SHARK2=m -CONFIG_USB_KEENE=m -CONFIG_USB_RAREMONO=m -CONFIG_USB_MA901=m -CONFIG_RADIO_TEA5764=m -CONFIG_RADIO_SAA7706H=m -CONFIG_RADIO_TEF6862=m -CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL128X=m -CONFIG_MEDIA_COMMON_OPTIONS=y - -# -# common driver options -# -CONFIG_VIDEO_CX2341X=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_TTPCI_EEPROM=m -CONFIG_CYPRESS_FIRMWARE=m -CONFIG_VIDEOBUF2_CORE=m -CONFIG_VIDEOBUF2_V4L2=m -CONFIG_VIDEOBUF2_MEMOPS=m -CONFIG_VIDEOBUF2_DMA_CONTIG=m -CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m -CONFIG_VIDEOBUF2_DVB=m -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -CONFIG_SMS_SIANO_MDTV=m -CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set -CONFIG_VIDEO_V4L2_TPG=m +CONFIG_MEDIA_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_CADENCE=y -CONFIG_VIDEO_CADENCE_CSI2RX=m -CONFIG_VIDEO_CADENCE_CSI2TX=m -CONFIG_VIDEO_ASPEED=m +CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m -CONFIG_DVB_PLATFORM_DRIVERS=y # -# MMC/SDIO DVB adapters +# Allegro DVT media platform drivers # -CONFIG_SMS_SDIO_DRV=m -CONFIG_V4L_TEST_DRIVERS=y -CONFIG_VIDEO_VIMC=m -CONFIG_VIDEO_VIVID=m -CONFIG_VIDEO_VIVID_CEC=y -CONFIG_VIDEO_VIVID_MAX_DEVS=64 -CONFIG_VIDEO_VIM2M=m -CONFIG_VIDEO_VICODEC=m -CONFIG_DVB_TEST_DRIVERS=y -CONFIG_DVB_VIDTV=m # -# FireWire (IEEE 1394) Adapters +# Amlogic media platform drivers # -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_INPUT=y -# end of Media drivers -CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y +# +# Amphion drivers +# # -# Media ancillary drivers +# Aspeed media platform drivers # -CONFIG_MEDIA_ATTACH=y +CONFIG_VIDEO_ASPEED=m # -# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# Atmel media platform drivers # -CONFIG_VIDEO_IR_I2C=m # -# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers' +# Cadence media platform drivers # -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS3308=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_UDA1342=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m -CONFIG_VIDEO_SONY_BTF_MPX=m -CONFIG_VIDEO_SAA6588=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_TW2804=m -CONFIG_VIDEO_TW9903=m -CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_CADENCE_CSI2RX=m +CONFIG_VIDEO_CADENCE_CSI2TX=m # -# Video and audio decoders +# Chips&Media media platform drivers # -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_CX25840=m -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_SAA6752HS=m -CONFIG_VIDEO_M52790=m + +# +# Intel media platform drivers +# + +# +# Marvell media platform drivers +# +CONFIG_VIDEO_CAFE_CCIC=m + +# +# Mediatek media platform drivers +# + +# +# NVidia media platform drivers +# + +# +# NXP media platform drivers +# + +# +# Qualcomm media platform drivers +# + +# +# Renesas media platform drivers +# + +# +# Rockchip media platform drivers +# + +# +# Samsung media platform drivers +# + +# +# STMicroelectronics media platform drivers +# + +# +# Sunxi media platform drivers +# + +# +# Texas Instruments drivers +# + +# +# VIA media platform drivers +# + +# +# Xilinx media platform drivers +# + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_DVB_TEST_DRIVERS=y +CONFIG_DVB_VIDTV=m + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_CYPRESS_FIRMWARE=m +CONFIG_TTPCI_EEPROM=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y +# CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_V4L2=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +CONFIG_VIDEOBUF2_DMA_SG=m +CONFIG_VIDEOBUF2_DVB=m +# end of Media drivers + +CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m # # Camera sensor devices @@ -6065,6 +6175,7 @@ CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_HI556=m CONFIG_VIDEO_HI846=m +CONFIG_VIDEO_HI847=m CONFIG_VIDEO_IMX208=m CONFIG_VIDEO_IMX214=m CONFIG_VIDEO_IMX219=m @@ -6073,7 +6184,22 @@ CONFIG_VIDEO_IMX274=m CONFIG_VIDEO_IMX290=m CONFIG_VIDEO_IMX319=m CONFIG_VIDEO_IMX355=m +CONFIG_VIDEO_MAX9271_LIB=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_OG01A1B=m CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV08D10=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_OV13B10=m CONFIG_VIDEO_OV2640=m CONFIG_VIDEO_OV2659=m CONFIG_VIDEO_OV2680=m @@ -6081,47 +6207,34 @@ CONFIG_VIDEO_OV2685=m CONFIG_VIDEO_OV2740=m CONFIG_VIDEO_OV5647=m CONFIG_VIDEO_OV5648=m -CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV5670=m CONFIG_VIDEO_OV5675=m CONFIG_VIDEO_OV5693=m CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV6650=m CONFIG_VIDEO_OV7251=m -CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV772X=m CONFIG_VIDEO_OV7740=m CONFIG_VIDEO_OV8856=m CONFIG_VIDEO_OV8865=m CONFIG_VIDEO_OV9640=m CONFIG_VIDEO_OV9650=m CONFIG_VIDEO_OV9734=m -CONFIG_VIDEO_OV13858=m -CONFIG_VIDEO_OV13B10=m -CONFIG_VIDEO_VS6624=m -CONFIG_VIDEO_MT9M001=m -CONFIG_VIDEO_MT9M032=m -CONFIG_VIDEO_MT9M111=m -CONFIG_VIDEO_MT9P031=m -CONFIG_VIDEO_MT9T001=m -CONFIG_VIDEO_MT9T112=m -CONFIG_VIDEO_MT9V011=m -CONFIG_VIDEO_MT9V032=m -CONFIG_VIDEO_MT9V111=m -CONFIG_VIDEO_SR030PC30=m -CONFIG_VIDEO_NOON010PC30=m -CONFIG_VIDEO_M5MOLS=m -CONFIG_VIDEO_MAX9271_LIB=m CONFIG_VIDEO_RDACM20=m CONFIG_VIDEO_RDACM21=m CONFIG_VIDEO_RJ54N1=m -CONFIG_VIDEO_S5K6AA=m -CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5C73M3=m CONFIG_VIDEO_S5K4ECGX=m CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VS6624=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -CONFIG_VIDEO_S5C73M3=m +CONFIG_VIDEO_M5MOLS=m # end of Camera sensor devices # @@ -6143,6 +6256,41 @@ CONFIG_VIDEO_LM3646=m # end of Flash devices # +# audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_CS3308=m +CONFIG_VIDEO_CS5345=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_SONY_BTF_MPX=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_SAA6752HS=m +CONFIG_VIDEO_M52790=m + +# # SPI I2C drivers auto-selected by 'Autoselect ancillary drivers' # @@ -6150,6 +6298,7 @@ CONFIG_VIDEO_LM3646=m # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m +CONFIG_VIDEO_GS1662=m # end of Media SPI Adapters CONFIG_MEDIA_TUNER=m @@ -6157,42 +6306,42 @@ CONFIG_MEDIA_TUNER=m # # Tuner drivers auto-selected by 'Autoselect ancillary drivers' # +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_IT913X=m +CONFIG_MEDIA_TUNER_M88RS6000T=m +CONFIG_MEDIA_TUNER_MAX2165=m +CONFIG_MEDIA_TUNER_MC44S803=m +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2063=m +CONFIG_MEDIA_TUNER_MT20XX=m +CONFIG_MEDIA_TUNER_MT2131=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_MXL301RF=m +CONFIG_MEDIA_TUNER_MXL5005S=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_QM1D1C0042=m +CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_R820T=m +CONFIG_MEDIA_TUNER_SI2157=m CONFIG_MEDIA_TUNER_SIMPLE=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_TDA18218=m CONFIG_MEDIA_TUNER_TDA18250=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m CONFIG_MEDIA_TUNER_TDA18271=m +CONFIG_MEDIA_TUNER_TDA827X=m +CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA9887=m CONFIG_MEDIA_TUNER_TEA5761=m CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2063=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m +CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m CONFIG_MEDIA_TUNER_XC4000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_MEDIA_TUNER_MAX2165=m -CONFIG_MEDIA_TUNER_TDA18218=m -CONFIG_MEDIA_TUNER_FC0011=m -CONFIG_MEDIA_TUNER_FC0012=m -CONFIG_MEDIA_TUNER_FC0013=m -CONFIG_MEDIA_TUNER_TDA18212=m -CONFIG_MEDIA_TUNER_E4000=m -CONFIG_MEDIA_TUNER_FC2580=m -CONFIG_MEDIA_TUNER_M88RS6000T=m -CONFIG_MEDIA_TUNER_TUA9001=m -CONFIG_MEDIA_TUNER_SI2157=m -CONFIG_MEDIA_TUNER_IT913X=m -CONFIG_MEDIA_TUNER_R820T=m -CONFIG_MEDIA_TUNER_MXL301RF=m -CONFIG_MEDIA_TUNER_QM1D1C0042=m -CONFIG_MEDIA_TUNER_QM1D1B0004=m +CONFIG_MEDIA_TUNER_XC5000=m # # DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers' @@ -6201,116 +6350,116 @@ CONFIG_MEDIA_TUNER_QM1D1B0004=m # # Multistandard (satellite) frontends # +CONFIG_DVB_M88DS3103=m +CONFIG_DVB_MXL5XX=m CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m CONFIG_DVB_STV090x=m CONFIG_DVB_STV0910=m CONFIG_DVB_STV6110x=m CONFIG_DVB_STV6111=m -CONFIG_DVB_MXL5XX=m -CONFIG_DVB_M88DS3103=m # # Multistandard (cable + terrestrial) frontends # CONFIG_DVB_DRXK=m -CONFIG_DVB_TDA18271C2DD=m -CONFIG_DVB_SI2165=m CONFIG_DVB_MN88472=m CONFIG_DVB_MN88473=m +CONFIG_DVB_SI2165=m +CONFIG_DVB_TDA18271C2DD=m # # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m +CONFIG_DVB_CX24116=m +CONFIG_DVB_CX24117=m +CONFIG_DVB_CX24120=m CONFIG_DVB_CX24123=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_ZL10039=m CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m +CONFIG_DVB_SI21XX=m CONFIG_DVB_STB6000=m +CONFIG_DVB_STV0288=m CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_TDA10071=m CONFIG_DVB_TDA10086=m +CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_CX24117=m -CONFIG_DVB_CX24120=m -CONFIG_DVB_SI21XX=m CONFIG_DVB_TS2020=m -CONFIG_DVB_DS3000=m -CONFIG_DVB_MB86A16=m -CONFIG_DVB_TDA10071=m +CONFIG_DVB_TUA6100=m +CONFIG_DVB_TUNER_CX24113=m +CONFIG_DVB_TUNER_ITD1000=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP887X=m +CONFIG_DVB_AF9013=m +CONFIG_DVB_AS102_FE=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m +CONFIG_DVB_CXD2820R=m +CONFIG_DVB_CXD2841ER=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m +CONFIG_DVB_DRXD=m CONFIG_DVB_EC100=m -CONFIG_DVB_STV0367=m -CONFIG_DVB_CXD2820R=m -CONFIG_DVB_CXD2841ER=m +CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_L64781=m +CONFIG_DVB_MT352=m +CONFIG_DVB_NXT6000=m CONFIG_DVB_RTL2830=m CONFIG_DVB_RTL2832=m CONFIG_DVB_SI2168=m -CONFIG_DVB_AS102_FE=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_STV0367=m +CONFIG_DVB_TDA10048=m +CONFIG_DVB_TDA1004X=m CONFIG_DVB_ZD1301_DEMOD=m -CONFIG_DVB_GP8PSK_FE=m +CONFIG_DVB_ZL10353=m # # DVB-C (cable) frontends # -CONFIG_DVB_VES1820=m +CONFIG_DVB_STV0297=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m +CONFIG_DVB_VES1820=m # # ATSC (North American/Korean Terrestrial/Cable DTV) frontends # -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m +CONFIG_DVB_LG2160=m CONFIG_DVB_LGDT3305=m CONFIG_DVB_LGDT3306A=m -CONFIG_DVB_LG2160=m +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_MXL692=m +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_OR51211=m CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_AU8522_DTV=m -CONFIG_DVB_AU8522_V4L=m CONFIG_DVB_S5H1411=m -CONFIG_DVB_MXL692=m # # ISDB-T (terrestrial) frontends # -CONFIG_DVB_S921=m CONFIG_DVB_DIB8000=m CONFIG_DVB_MB86A20S=m +CONFIG_DVB_S921=m # # ISDB-S (satellite) & ISDB-T (terrestrial) frontends @@ -6327,23 +6476,23 @@ CONFIG_DVB_TUNER_DIB0090=m # # SEC control devices for DVB-S # -CONFIG_DVB_DRX39XYJ=m -CONFIG_DVB_LNBH25=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_LNBP22=m +CONFIG_DVB_A8293=m +CONFIG_DVB_AF9033=m +CONFIG_DVB_ASCOT2E=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_HELENE=m +CONFIG_DVB_HORUS3A=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_ISL6423=m -CONFIG_DVB_A8293=m -CONFIG_DVB_LGS8GXX=m -CONFIG_DVB_ATBM8830=m -CONFIG_DVB_TDA665x=m CONFIG_DVB_IX2505V=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_LNBH25=m +CONFIG_DVB_LNBP21=m +CONFIG_DVB_LNBP22=m CONFIG_DVB_M88RS2000=m -CONFIG_DVB_AF9033=m -CONFIG_DVB_HORUS3A=m -CONFIG_DVB_ASCOT2E=m -CONFIG_DVB_HELENE=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_DRX39XYJ=m # # Common Interface (EN50221) controller drivers @@ -6366,8 +6515,6 @@ CONFIG_AGP_INTEL=m CONFIG_AGP_SIS=m CONFIG_AGP_VIA=m CONFIG_INTEL_GTT=m -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=10 CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=y CONFIG_DRM_MIPI_DBI=m @@ -6375,12 +6522,14 @@ CONFIG_DRM_MIPI_DSI=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DEBUG_MM is not set # CONFIG_DRM_DEBUG_SELFTEST is not set +CONFIG_DRM_DP_HELPER=m CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m +CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m CONFIG_DRM_GEM_CMA_HELPER=m @@ -6484,6 +6633,7 @@ CONFIG_DRM_ANALOGIX_DP=m CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m CONFIG_DRM_GM12U320=m +CONFIG_DRM_PANEL_MIPI_DBI=m CONFIG_DRM_SIMPLEDRM=y CONFIG_TINYDRM_HX8357D=m CONFIG_TINYDRM_ILI9163=m @@ -6498,6 +6648,8 @@ CONFIG_DRM_XEN=y CONFIG_DRM_XEN_FRONTEND=m CONFIG_DRM_VBOXVIDEO=m CONFIG_DRM_GUD=m +CONFIG_DRM_SSD130X=m +CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_HYPERV=m # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -6873,8 +7025,10 @@ CONFIG_SND_SOC_AMD_ACP6x=m CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_AMD_ACP_CONFIG=m CONFIG_SND_SOC_AMD_ACP_COMMON=m +CONFIG_SND_SOC_AMD_ACP_PDM=m CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_PCM=m +CONFIG_SND_SOC_AMD_ACP_PCI=m CONFIG_SND_AMD_ASOC_RENOIR=m CONFIG_SND_SOC_AMD_MACH_COMMON=m CONFIG_SND_SOC_AMD_LEGACY_MACH=m @@ -6931,10 +7085,13 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m +CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m @@ -6974,6 +7131,7 @@ CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_MTK_BTCVSD=m @@ -6982,7 +7140,8 @@ CONFIG_SND_SOC_SOF_PCI_DEV=m CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_ACPI=m CONFIG_SND_SOC_SOF_ACPI_DEV=m -# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set +CONFIG_SND_SOC_SOF_DEBUG_PROBES=m +CONFIG_SND_SOC_SOF_CLIENT=m CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m @@ -7014,6 +7173,7 @@ CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m CONFIG_SND_SOC_SOF_HDA=m +CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m CONFIG_SND_SOC_SOF_XTENSA=m @@ -7058,6 +7218,7 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_ALC5623=m +CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_BD28623=m # CONFIG_SND_SOC_BT_SCO is not set CONFIG_SND_SOC_CROS_EC_CODEC=m @@ -7199,6 +7360,7 @@ CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TAS5720=m +CONFIG_SND_SOC_TAS5805M=m CONFIG_SND_SOC_TAS6424=m CONFIG_SND_SOC_TDA7419=m CONFIG_SND_SOC_TFA9879=m @@ -7263,6 +7425,7 @@ CONFIG_SND_SOC_NAU8822=m CONFIG_SND_SOC_NAU8824=m CONFIG_SND_SOC_NAU8825=m CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_LPASS_MACRO_COMMON=m CONFIG_SND_SOC_LPASS_WSA_MACRO=m CONFIG_SND_SOC_LPASS_VA_MACRO=m CONFIG_SND_SOC_LPASS_RX_MACRO=m @@ -7324,6 +7487,7 @@ CONFIG_HID_GFRM=m CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y +CONFIG_HID_VIVALDI_COMMON=m CONFIG_HID_GOOGLE_HAMMER=m CONFIG_HID_VIVALDI=m CONFIG_HID_GT683R=m @@ -7375,12 +7539,14 @@ CONFIG_HID_PICOLCD_CIR=y CONFIG_HID_PLANTRONICS=m CONFIG_HID_PLAYSTATION=m CONFIG_PLAYSTATION_FF=y +CONFIG_HID_RAZER=m CONFIG_HID_PRIMAX=m CONFIG_HID_RETRODE=m CONFIG_HID_ROCCAT=m CONFIG_HID_SAITEK=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SEMITEK=m +CONFIG_HID_SIGMAMICRO=m CONFIG_HID_SONY=m CONFIG_SONY_FF=y CONFIG_HID_SPEEDLINK=m @@ -7839,8 +8005,10 @@ CONFIG_TYPEC_UCSI=m CONFIG_UCSI_CCG=m CONFIG_UCSI_ACPI=m CONFIG_TYPEC_TPS6598X=m +CONFIG_TYPEC_RT1719=m CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC_STUSB160X=m +CONFIG_TYPEC_WUSB3801=m # # USB Type-C Multiplexer/DeMultiplexer Switch support @@ -8306,9 +8474,11 @@ CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y +CONFIG_MLX5_VFIO_PCI=m CONFIG_VFIO_MDEV=m CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y +CONFIG_VMGENID=y CONFIG_VBOXGUEST=m CONFIG_NITRO_ENCLAVES=m CONFIG_ACRN_HSM=m @@ -8424,7 +8594,6 @@ CONFIG_ADIS16240=m # Analog to digital converters # CONFIG_AD7816=m -CONFIG_AD7280=m # end of Analog to digital converters # @@ -8489,18 +8658,10 @@ CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET_PATCH=m CONFIG_DVB_SP8870=m - -# -# Android -# -CONFIG_ASHMEM=y -# end of Android - CONFIG_LTE_GDM724X=m CONFIG_FIREWIRE_SERIAL=m CONFIG_FWTTY_MAX_TOTAL_PORTS=64 CONFIG_FWTTY_MAX_CARD_PORTS=32 -CONFIG_GS_FPGABOOT=m CONFIG_UNISYSSPAR=y CONFIG_UNISYS_VISORNIC=m CONFIG_UNISYS_VISORINPUT=m @@ -8529,6 +8690,7 @@ CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m CONFIG_AMD_PMC=m +CONFIG_AMD_HSMP=m CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m CONFIG_ASUS_LAPTOP=m @@ -8576,7 +8738,6 @@ CONFIG_THINKPAD_LMI=m CONFIG_INTEL_ATOMISP2_PDX86=y CONFIG_INTEL_ATOMISP2_LED=m CONFIG_INTEL_SAR_INT1092=m -CONFIG_INTEL_CHT_INT33FE=m CONFIG_INTEL_SKL_INT3472=m CONFIG_INTEL_PMC_CORE=y CONFIG_INTEL_PMT_CLASS=m @@ -8593,19 +8754,27 @@ CONFIG_INTEL_TELEMETRY=m CONFIG_INTEL_WMI=y CONFIG_INTEL_WMI_SBL_FW_UPDATE=m CONFIG_INTEL_WMI_THUNDERBOLT=m + +# +# Intel Uncore Frequency Control +# +CONFIG_INTEL_UNCORE_FREQ_CONTROL=m +# end of Intel Uncore Frequency Control + CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_VBTN=m CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_BXTWC_PMIC_TMU=m CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_INTEL_CHTWC_INT33FE=m CONFIG_INTEL_ISHTP_ECLITE=m CONFIG_INTEL_MRFLD_PWRBTN=m CONFIG_INTEL_PUNIT_IPC=m CONFIG_INTEL_RST=m +CONFIG_INTEL_SDSI=m CONFIG_INTEL_SMARTCONNECT=m CONFIG_INTEL_TURBO_MAX_3=y -CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VSEC=m CONFIG_MSI_LAPTOP=m CONFIG_MSI_WMI=m @@ -8625,7 +8794,7 @@ CONFIG_SONY_LAPTOP=m CONFIG_SONYPI_COMPAT=y CONFIG_SYSTEM76_ACPI=m CONFIG_TOPSTAR_LAPTOP=m -CONFIG_I2C_MULTI_INSTANTIATE=m +CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_MLX_PLATFORM=m CONFIG_TOUCHSCREEN_DMI=y CONFIG_X86_ANDROID_TABLETS=m @@ -8657,6 +8826,7 @@ CONFIG_CROS_EC_SYSFS=m CONFIG_CROS_EC_TYPEC=m CONFIG_CROS_USBPD_LOGGER=m CONFIG_CROS_USBPD_NOTIFY=m +CONFIG_CHROMEOS_PRIVACY_SCREEN=m CONFIG_WILCO_EC=m CONFIG_WILCO_EC_DEBUGFS=m CONFIG_WILCO_EC_EVENTS=m @@ -8667,7 +8837,6 @@ CONFIG_MLXREG_IO=m CONFIG_MLXREG_LC=m CONFIG_SURFACE_PLATFORMS=y CONFIG_SURFACE3_WMI=m -CONFIG_SURFACE_3_BUTTON=m CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE_ACPI_NOTIFY=m CONFIG_SURFACE_AGGREGATOR_CDEV=m @@ -8725,7 +8894,7 @@ CONFIG_IOMMU_IO_PGTABLE=y CONFIG_IOMMU_DEFAULT_DMA_LAZY=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_DMA=y -CONFIG_IOMMU_SVA_LIB=y +CONFIG_IOMMU_SVA=y CONFIG_AMD_IOMMU=y CONFIG_AMD_IOMMU_V2=y CONFIG_DMAR_TABLE=y @@ -8750,6 +8919,7 @@ CONFIG_REMOTEPROC_CDEV=y # CONFIG_RPMSG=m CONFIG_RPMSG_CHAR=m +CONFIG_RPMSG_CTRL=m CONFIG_RPMSG_NS=m CONFIG_RPMSG_QCOM_GLINK=m CONFIG_RPMSG_QCOM_GLINK_RPM=m @@ -8876,6 +9046,9 @@ CONFIG_ADXL313_SPI=m CONFIG_ADXL355=m CONFIG_ADXL355_I2C=m CONFIG_ADXL355_SPI=m +CONFIG_ADXL367=m +CONFIG_ADXL367_SPI=m +CONFIG_ADXL367_I2C=m CONFIG_ADXL372=m CONFIG_ADXL372_SPI=m CONFIG_ADXL372_I2C=m @@ -8929,6 +9102,7 @@ CONFIG_AD7091R5=m CONFIG_AD7124=m CONFIG_AD7192=m CONFIG_AD7266=m +CONFIG_AD7280=m CONFIG_AD7291=m CONFIG_AD7292=m CONFIG_AD7298=m @@ -9010,6 +9184,7 @@ CONFIG_AD74413R=m # Amplifiers # CONFIG_AD8366=m +CONFIG_ADA4250=m CONFIG_HMC425=m # end of Amplifiers @@ -9087,6 +9262,7 @@ CONFIG_AD5592R=m CONFIG_AD5593R=m CONFIG_AD5504=m CONFIG_AD5624R_SPI=m +CONFIG_LTC2688=m CONFIG_AD5686=m CONFIG_AD5686_SPI=m CONFIG_AD5696_I2C=m @@ -9142,6 +9318,8 @@ CONFIG_AD9523=m CONFIG_ADF4350=m CONFIG_ADF4371=m CONFIG_ADMV1013=m +CONFIG_ADMV1014=m +CONFIG_ADMV4420=m CONFIG_ADRF6780=m # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -9409,7 +9587,10 @@ CONFIG_MB1232=m CONFIG_PING=m CONFIG_RFD77402=m CONFIG_SRF04=m +CONFIG_SX_COMMON=m CONFIG_SX9310=m +CONFIG_SX9324=m +CONFIG_SX9360=m CONFIG_SX9500=m CONFIG_SRF08=m CONFIG_VCNL3020=m @@ -9508,8 +9689,6 @@ CONFIG_POWERCAP=y CONFIG_INTEL_RAPL_CORE=m CONFIG_INTEL_RAPL=m CONFIG_IDLE_INJECT=y -CONFIG_DTPM=y -CONFIG_DTPM_CPU=y CONFIG_MCB=m CONFIG_MCB_PCI=m CONFIG_MCB_LPC=m @@ -9538,7 +9717,6 @@ CONFIG_ANDROID_BINDER_DEVICES="" CONFIG_LIBNVDIMM=y CONFIG_BLK_DEV_PMEM=m -CONFIG_ND_BLK=m CONFIG_ND_CLAIM=y CONFIG_ND_BTT=m CONFIG_BTT=y @@ -9626,6 +9804,7 @@ CONFIG_MOST=m CONFIG_MOST_USB_HDM=m CONFIG_MOST_CDEV=m CONFIG_MOST_SND=m +# CONFIG_PECI is not set # end of Device Drivers # @@ -9694,6 +9873,7 @@ CONFIG_F2FS_FS_LZ4=y CONFIG_F2FS_FS_LZ4HC=y CONFIG_F2FS_FS_ZSTD=y CONFIG_F2FS_IOSTAT=y +CONFIG_F2FS_UNFAIR_RWSEM=y CONFIG_ZONEFS_FS=m CONFIG_FS_DAX=y CONFIG_FS_DAX_PMD=y @@ -9939,7 +10119,6 @@ CONFIG_NFS_DEBUG=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_PNFS=y @@ -10059,13 +10238,13 @@ CONFIG_KEYS_REQUEST_CACHE=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_TRUSTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m +# CONFIG_USER_DECRYPTED_DATA is not set CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y @@ -10108,14 +10287,24 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set CONFIG_SECURITY_LANDLOCK=y -# CONFIG_INTEGRITY is not set +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY_PLATFORM_KEYRING=y +CONFIG_INTEGRITY_MACHINE_KEYRING=y +CONFIG_LOAD_UEFI_KEYS=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_IMA is not set +# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set +# CONFIG_EVM is not set # CONFIG_DEFAULT_SECURITY_SELINUX is not set # CONFIG_DEFAULT_SECURITY_SMACK is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="landlock,lockdown,yama,bpf" +CONFIG_LSM="landlock,lockdown,yama,integrity,bpf" # # Kernel hardening options @@ -10184,6 +10373,7 @@ CONFIG_CRYPTO_ENGINE=m # CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_ECC=y CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDSA=y @@ -10243,6 +10433,7 @@ CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_BLAKE2S_X86=m CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_POLY1305_X86_64=m @@ -10258,6 +10449,7 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_SM3_AVX_X86_64=m CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m @@ -10358,10 +10550,8 @@ CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m CONFIG_X509_CERTIFICATE_PARSER=y CONFIG_PKCS8_PRIVATE_KEY_PARSER=m -CONFIG_TPM_KEY_PARSER=m CONFIG_PKCS7_MESSAGE_PARSER=y # CONFIG_PKCS7_TEST_KEY is not set CONFIG_SIGNED_PE_FILE_VERIFICATION=y @@ -10424,12 +10614,15 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_LIB_SM3=m CONFIG_CRYPTO_LIB_SM4=m # end of Crypto library routines +CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=y CONFIG_CRC16=m CONFIG_CRC_T10DIF=y +CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_ITU_T=m CONFIG_CRC32=y # CONFIG_CRC32_SELFTEST is not set @@ -10437,7 +10630,7 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC32_SLICEBY4 is not set # CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_BIT is not set -CONFIG_CRC64=m +CONFIG_CRC64=y CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m @@ -10520,6 +10713,7 @@ CONFIG_LRU_CACHE=m CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y +CONFIG_SIGNATURE=y CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y @@ -10575,18 +10769,24 @@ CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_MISC is not set + # # Compile-time checks and compiler options # CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_NONE is not set +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +CONFIG_DEBUG_INFO_DWARF5=y # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_SPLIT is not set -# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set -CONFIG_DEBUG_INFO_DWARF4=y CONFIG_DEBUG_INFO_BTF=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y CONFIG_DEBUG_INFO_BTF_MODULES=y +# CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_GDB_SCRIPTS is not set CONFIG_FRAME_WARN=2048 CONFIG_STRIP_ASM_SYMS=y @@ -10618,9 +10818,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y # CONFIG_KCSAN is not set # end of Generic Kernel Debugging Instruments -CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_MISC is not set - # # Networking Debugging # @@ -10668,6 +10865,7 @@ CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=100 CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_DEFERRABLE=y CONFIG_KFENCE_STRESS_TEST_FAULTS=0 # end of Memory Debugging @@ -10760,6 +10958,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_LATENCYTOP=y CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_RETHOOK=y +CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y @@ -10789,6 +10989,7 @@ CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_FPROBE=y CONFIG_FUNCTION_PROFILER=y CONFIG_STACK_TRACER=y # CONFIG_IRQSOFF_TRACER is not set @@ -10897,7 +11098,6 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set # CONFIG_TEST_XARRAY is not set -# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_IDA is not set @@ -10916,7 +11116,6 @@ CONFIG_ASYNC_RAID6_TEST=m # CONFIG_TEST_KMOD is not set # CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_OBJAGG is not set -# CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_MEMINIT is not set # CONFIG_TEST_HMM is not set # CONFIG_TEST_FREE_PAGES is not set From 576120558380347d9f068960b8d7f54d0f4e1ac0 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 02 2022 03:50:54 +0000 Subject: [PATCH 46/200] [iceweasel]: upgrade to v102.0.1 --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6b413a0..0abf140 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=102.0 +pkgver=102.0.1 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -75,6 +75,7 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb python-setuptools python-zstandard lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) +[[ "${CARCH}" == 'armv7h' ]] && makedepends+=( ${makedepends[*]/wasi*/} ) makedepends_i686=(gcc10) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' @@ -83,9 +84,9 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'hunspell-en_US: Spell checking, American English' 'xdg-desktop-portal: Screensharing with Wayland') replaces=('firefox') -options=(!emptydirs !makeflags !strip !lto !debug) # FIXME: can we still make debug package? +options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - zstandard-0.18.0.diff + cbindgen-0.24.0.diff zstandard-0.18.0.diff $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -99,8 +100,9 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf' +sha256sums=('7bba6ffd6e8e42d5c38aa2a453f5fa30dfc9ef150f2175aa0625edb68fddae70' 'SKIP' + '4628d136c3beada292e83cd8e89502cac4aa3836851b34259a665582a7713978' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' @@ -144,6 +146,17 @@ _check_build_config() { echo "Checking build configuration..." + # Each of the [ARCH-SPECIFIC CONFIG] branches in prepare(), should have prepared a + # $srcdir/mozconfig file with any arch-specific changes to the Arch x86_64 PKGBUILD. + # Finally, that file should have been copied to $srcdir/firefox-$pkgver/.mozconfig + grep '^ac_add_options --with-distribution-id=nu.parabola' .mozconfig || \ + ! echo "cannot continue without a .mozconfig file" || return 1 + + if [[ "${CARCH}" != 'armv7h' ]] # armv7h has no --disable-eme option + then grep '^ac_add_options --disable-eme' .mozconfig || \ + ! echo ".mozconfig file was not properly treated per the FSDG" || return 1 + fi + # Configure produces mozinfo.json that reflects current configuration. # See build/docs/mozinfo.rst ./mach configure @@ -196,6 +209,9 @@ prepare() { mkdir mozbuild cd firefox-$pkgver + # Unbreak build with cbindgen 0.24.0 + patch -Np1 -i ../cbindgen-0.24.0.diff + # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff @@ -217,15 +233,15 @@ ac_add_options --disable-bootstrap ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot # Branding -ac_add_options --disable-official-branding +ac_add_options --disable-official-branding # branding over-ride ac_add_options --enable-update-channel=release -ac_add_options --with-distribution-id=nu.parabola -ac_add_options --with-branding=browser/branding/${pkgname} -ac_add_options --with-app-name=${pkgname} -ac_add_options --with-app-basename=${pkgname} +ac_add_options --with-distribution-id=nu.parabola # branding over-ride +ac_add_options --with-branding=browser/branding/${pkgname} # branding over-ride +ac_add_options --with-app-name=${pkgname} # branding over-ride +ac_add_options --with-app-basename=${pkgname} # branding over-ride ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --allow-addon-sideload -# export MOZILLA_OFFICIAL=1 # branding over-ride +# export MOZILLA_OFFICIAL=1 # branding over-ride export MOZ_APP_REMOTINGNAME=${pkgname//-/} export MOZ_TELEMETRY_REPORTING= export MOZ_REQUIRE_SIGNING= @@ -242,22 +258,19 @@ ac_add_options --with-system-nss # Features ac_add_options --enable-alsa ac_add_options --enable-jack -ac_add_options --disable-crashreporter +ac_add_options --disable-crashreporter # anti-feature ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-eme END - # FIXME: FTBS with cbindgen > 0.23 (currently 0.24) - # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 - sed -i '/const uint64_t ROOT_CLIP_CHAIN = ~0;/d' gfx/webrender_bindings/webrender_ffi.h - - ## [ARCH-SPECIFIC CONFIG] ## case ${CARCH} in armv7h) + + # archarm has these changes in-line above sed -i ' /--enable-hardening/d /--enable-optimize/d @@ -265,23 +278,35 @@ END s|--with-wasi-sysroot=/usr/share/wasi-sysroot|--without-wasm-sandboxed-libraries| ' ../mozconfig - cat >>../mozconfig <> .mozconfig + # https://bugzilla.redhat.com/show_bug.cgi?id=1641623 + echo "ac_add_options --disable-av1" >> .mozconfig + # reduce jobs due to RAM constraints + MAKEFLAGS="-j4" + #MAKEFLAGS="-j1" + # disable hard-coded LTO + sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk + sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk + # increase codegen-units due to RAM constraints + sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk + # webrtc on ARMv7 implies android, so disable it + echo "ac_add_options --disable-webrtc" >> .mozconfig + + echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig + echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig + + # export statements are under the '[ARCH-SPECIFIC BUILD ENV]' section -# https://bugzilla.redhat.com/show_bug.cgi?id=1641623 -ac_add_options --disable-av1 -ac_add_options --enable-optimize="-g0 -O2" -mk_add_options MOZ_MAKE_FLAGS='-j1' -END + patch -p1 -i ../build-arm-libopus.patch # mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration # EME is disabled anyway in the built package, but better check if it exists for ARM each new release. sed -i 's|ac_add_options --disable-eme||' ../mozconfig - echo "applying build-arm-libopus.patch" - patch -p1 -i ../build-arm-libopus.patch + # for consistency across arches, we actually want .mozconfig to be ../mozconfig + # we allowed .mozconfig to be written, only to minimize the diff against archarm + # ${srcdir}/mozconfig will clobber firefox-$pkgver/.mozconfig later, in build() + cat .mozconfig >> ../mozconfig ;; i686) export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" @@ -586,8 +611,6 @@ END ## sanity checks ## - # each of the [ARCH-SPECIFIC BUILD CONFIG] branches above should have created .mozconfig - [[ -f .mozconfig ]] || ! echo "cannot continue without a .mozconfig file" || return 1 _check_build_config diff --git a/libre/iceweasel/cbindgen-0.24.0.diff b/libre/iceweasel/cbindgen-0.24.0.diff new file mode 100644 index 0000000..3011e8a --- /dev/null +++ b/libre/iceweasel/cbindgen-0.24.0.diff @@ -0,0 +1,17 @@ +Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places. +Author: Olivier Tilloy +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 +Forwarded: not-needed + +--- a/gfx/webrender_bindings/webrender_ffi.h ++++ b/gfx/webrender_bindings/webrender_ffi.h +@@ -73,8 +73,6 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; +- + } // namespace wr + } // namespace mozilla + + From 694801dd02f2f478f0e67f2815adb09c9f95ffc2 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Aug 02 2022 03:50:59 +0000 Subject: [PATCH 47/200] libre/iceweasel: 103.0-1.parabola1 * Update patches according to upstream changes * Remove patching of more-from-mozilla-qr-code-advanced.svg, dropped upstream [1]. * Add removal of winapi-{i686,x86_64}-pc-windows-gnu folders as these seem to contain some suspicious prebuilt static libraries [2] WARNING!!! Links can lead to nonfree works, like JavaScript frontend code, especially on GitHub. [1] https://bugzilla.mozilla.org/show_bug.cgi?id=1767066 [2] https://github.com/retep998/winapi-rs/issues?q=license --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 08ab1e2..6df6152 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From e2e22a52ee5e5cf9f7c55854b828bb65a919b563 Mon Sep 17 00:00:00 2001 +From e63cc6359790ab8d7139bf9cdf8e3b527ba780e6 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -47,10 +47,10 @@ index 0a9da8d804..fdc387aa63 100644 > nimbus-desktop-experiments diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index 3439547610..e4b170454c 100644 +index cb7c26e729..696813dd53 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { +@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { className: "providerUrl", target: "_blank", @@ -60,10 +60,10 @@ index 3439547610..e4b170454c 100644 }, "nimbus-desktop-experiments"), ")"); } diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 31ad77d286..9f2e97f14c 100644 +index 23d6bf1a20..6f87bfa812 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -106,7 +106,7 @@ var Utils = { +@@ -108,7 +108,7 @@ var Utils = { : AppConstants.REMOTE_SETTINGS_SERVER_URL; }, @@ -86,10 +86,10 @@ index 3bc70462c4..dc9592c9fa 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm -index 0bf60e5f16..5561b885f6 100644 +index a3100fac89..3720829575 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm -@@ -158,13 +158,13 @@ var SearchUtils = { +@@ -157,13 +157,13 @@ var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -129,10 +129,10 @@ index c782f9f7c3..4d773d27c5 100644 +.. _viewed live: resource://app/defaults/settings/main/search-config.json .. _Normandy: /toolkit/components/normandy/normandy/services.html diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm -index 7f8ac95dd9..fc34169ea5 100644 +index 9311d06758..fd87704d83 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm -@@ -420,9 +420,9 @@ this.AppConstants = Object.freeze({ +@@ -423,9 +423,9 @@ var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -158,10 +158,10 @@ index 667d9fc628..b2bf628f29 100644 #define PROD_CID "windows-default-browser-agent" #define PROD_ID "state" -- -2.37.0 +2.37.1 -From 9329ba8b85b542759a089818d70ba86d0a5b9a60 Mon Sep 17 00:00:00 2001 +From 1b75c1b90928d362b6b7723b57c3c0d501145807 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -174,11 +174,11 @@ the user profile, so that it doesn't get picked up by push broadcast service. --- dom/push/PushBroadcastService.jsm | 13 +++++++++++++ - services/settings/remote-settings.js | 7 ++----- - 2 files changed, 15 insertions(+), 5 deletions(-) + services/settings/remote-settings.js | 11 ++--------- + 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm -index 1ee7986f6a..db73413b1a 100644 +index 85c1bf6634..d2094ebb9c 100644 --- a/dom/push/PushBroadcastService.jsm +++ b/dom/push/PushBroadcastService.jsm @@ -179,6 +179,19 @@ var BroadcastService = class { @@ -202,19 +202,23 @@ index 1ee7986f6a..db73413b1a 100644 * Call the listeners of the specified broadcasts. * diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js -index f7e8e24748..57d11d71b3 100644 +index bfe9226f88..01abff0fb1 100644 --- a/services/settings/remote-settings.js +++ b/services/settings/remote-settings.js -@@ -533,7 +533,7 @@ function remoteSettingsFunction() { +@@ -580,11 +580,7 @@ function remoteSettingsFunction() { moduleURI: __URI__, symbolName: "remoteSettingsBroadcastHandler", }; -- pushBroadcastService.addListener(BROADCAST_ID, currentVersion, moduleInfo); -+ pushBroadcastService.deleteListener(BROADCAST_ID); +- lazy.pushBroadcastService.addListener( +- BROADCAST_ID, +- currentVersion, +- moduleInfo +- ); ++ lazy.pushBroadcastService.deleteListener(BROADCAST_ID); }; return remoteSettings; -@@ -553,9 +553,6 @@ var remoteSettingsBroadcastHandler = { +@@ -604,9 +600,6 @@ var remoteSettingsBroadcastHandler = { `Push notification received (version=${version} phase=${phase})` ); @@ -226,10 +230,10 @@ index f7e8e24748..57d11d71b3 100644 }, }; -- -2.37.0 +2.37.1 -From 11631dd36d3eeecc5f22171d5e059fbe7662c77c Mon Sep 17 00:00:00 2001 +From 8b367f58916f12d73a392fa629673e3a797a1a64 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -270,10 +274,10 @@ index 3bfed26ea4..807eb220ec 100644 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 -- -2.37.0 +2.37.1 -From d720d5680fa97ad53998b6050bc28df4503f0c39 Mon Sep 17 00:00:00 2001 +From ea39895fee8e1dcf71b8779d33ae641a30dca384 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -304,10 +308,10 @@ index 73a41dc25b..04c2a3fb6a 100644 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 9f2e97f14c..4e140f0fdd 100644 +index 6f87bfa812..8f878754a5 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -377,7 +377,7 @@ var Utils = { +@@ -380,7 +380,7 @@ var Utils = { async fetchLatestChanges(serverUrl, options = {}) { const { expectedTimestamp, lastEtag = "", filters = {} } = options; @@ -316,7 +320,7 @@ index 9f2e97f14c..4e140f0fdd 100644 const params = { ...filters, _expected: expectedTimestamp ?? 0, -@@ -392,7 +392,11 @@ var Utils = { +@@ -395,7 +395,11 @@ var Utils = { .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) .join("&"); } @@ -329,7 +333,7 @@ index 9f2e97f14c..4e140f0fdd 100644 if (response.status >= 500) { throw new Error(`Server error ${response.status} ${response.statusText}`); -@@ -427,7 +431,15 @@ var Utils = { +@@ -430,7 +434,15 @@ var Utils = { } } @@ -373,10 +377,10 @@ index f407580bfa..53e9d8b45e 100644 ] -- -2.37.0 +2.37.1 -From 98496943d01589201771f69e14ba6b3cb7395e48 Mon Sep 17 00:00:00 2001 +From 442dd6b2fff0cd43c9e7e43d1d2bd63269ddc3c2 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -384,22 +388,23 @@ Subject: [PATCH 05/13] Utils: disable offline checking Since only local data is read now, it should always return false for the current and any future code that relies on it. --- - services/settings/Utils.jsm | 9 --------- - 1 file changed, 9 deletions(-) + services/settings/Utils.jsm | 10 ---------- + 1 file changed, 10 deletions(-) diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 4e140f0fdd..5d448da54c 100644 +index 8f878754a5..fdf7181c14 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -192,15 +192,6 @@ var Utils = { +@@ -194,16 +194,6 @@ var Utils = { * @return {bool} Whether network is down or not. */ get isOffline() { - try { - return ( - Services.io.offline || -- CaptivePortalService.state == CaptivePortalService.LOCKED_PORTAL || -- !gNetworkLinkService.isLinkUp +- lazy.CaptivePortalService.state == +- lazy.CaptivePortalService.LOCKED_PORTAL || +- !lazy.gNetworkLinkService.isLinkUp - ); - } catch (ex) { - log.warn("Could not determine network status.", ex); @@ -408,10 +413,10 @@ index 4e140f0fdd..5d448da54c 100644 }, -- -2.37.0 +2.37.1 -From 738c1836a53ead5253ab3e0f9750aec94192dff0 Mon Sep 17 00:00:00 2001 +From c2f06f79b0d5d78ab3a81ec7f85053d7b3e761af Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -424,25 +429,25 @@ integrity checking of the locally cached data. 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm -index 147ebb6b13..c86e218fd3 100644 +index 9fc1794f90..50e69f56a0 100644 --- a/services/settings/RemoteSettingsWorker.jsm +++ b/services/settings/RemoteSettingsWorker.jsm -@@ -189,6 +189,10 @@ class Worker { +@@ -191,6 +191,10 @@ class Worker { // task on the current thread instead of the worker thread. - return SharedUtils.checkContentHash(buffer, size, hash); + return lazy.SharedUtils.checkContentHash(buffer, size, hash); } + + async getContentHash(bytes) { -+ return SharedUtils.getContentHash(bytes); ++ return lazy.SharedUtils.getContentHash(bytes); + } } // Now, first add a shutdown blocker. If that fails, we must have diff --git a/services/settings/SharedUtils.jsm b/services/settings/SharedUtils.jsm -index 5d32fb38bd..753a1b1393 100644 +index 9804e80c91..de67b0fb6f 100644 --- a/services/settings/SharedUtils.jsm +++ b/services/settings/SharedUtils.jsm -@@ -28,11 +28,16 @@ var SharedUtils = { +@@ -23,11 +23,16 @@ var SharedUtils = { return false; } // Has expected content? @@ -462,10 +467,10 @@ index 5d32fb38bd..753a1b1393 100644 /** -- -2.37.0 +2.37.1 -From fa07a0a3fbd62a0d973a4ca07fdc3a5cf2209841 Mon Sep 17 00:00:00 2001 +From f9aa27662b2018a543d71e2443397beecc73ee5e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -500,16 +505,16 @@ the upgrade to local-only setup. 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index eee1487491..90e82772c4 100644 +index 2b07a06b26..77da7304b6 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -592,11 +592,9 @@ class RemoteSettingsClient extends EventEmitter { +@@ -668,11 +668,9 @@ class RemoteSettingsClient extends EventEmitter { // If the data is up-to-date but don't have metadata (records loaded from dump), // we fetch them and validate the signature immediately. -- if (this.verifySignature && ObjectUtils.isEmpty(localMetadata)) { -+ if (this.verifySignature && ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) { - console.debug(`${this.identifier} pull collection metadata`); +- if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata)) { ++ if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) { + lazy.console.debug(`${this.identifier} pull collection metadata`); - const metadata = await this.httpClient().getData({ - query: { _expected: expectedTimestamp }, - }); @@ -517,7 +522,7 @@ index eee1487491..90e82772c4 100644 await this.db.importChanges(metadata); // We don't bother validating the signature if the dump was just loaded. We do // if the dump was loaded at some other point (eg. from .get()). -@@ -825,33 +823,23 @@ class RemoteSettingsClient extends EventEmitter { +@@ -935,33 +933,23 @@ class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ async _validateCollectionSignature(records, timestamp, metadata) { @@ -537,9 +542,9 @@ index eee1487491..90e82772c4 100644 - signature: { x5u, signature }, + json_dump_metadata: { hash, size }, } = metadata; -- const certChain = await (await Utils.fetch(x5u)).text(); +- const certChain = await (await lazy.Utils.fetch(x5u)).text(); // Merge remote records with local ones and serialize as canonical JSON. - const serialized = await RemoteSettingsWorker.canonicalStringify( + const serialized = await lazy.RemoteSettingsWorker.canonicalStringify( records, timestamp ); @@ -549,15 +554,15 @@ index eee1487491..90e82772c4 100644 - "p384ecdsa=" + signature, - certChain, - this.signerName, -- Utils.CERT_CHAIN_ROOT_IDENTIFIER -+ !(await RemoteSettingsWorker.checkContentHash( +- lazy.Utils.CERT_CHAIN_ROOT_IDENTIFIER ++ !(await lazy.RemoteSettingsWorker.checkContentHash( + new TextEncoder().encode(serialized), + size, + hash )) ) { throw new InvalidSignatureError(this.identifier); -@@ -1024,24 +1012,27 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1134,24 +1122,27 @@ class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -576,21 +581,21 @@ index eee1487491..90e82772c4 100644 - _since: since, - }, - } -+ const { data } = await SharedUtils.loadJSONDump( ++ const { data } = await lazy.SharedUtils.loadJSONDump( + this.bucketName, + this.collectionName - ); ++ ); + const remoteRecords = data ?? []; + -+ const serialized = await RemoteSettingsWorker.canonicalStringify( ++ const serialized = await lazy.RemoteSettingsWorker.canonicalStringify( + remoteRecords, + expectedTimestamp -+ ); + ); + const bytes = new TextEncoder().encode(serialized); + const metadata = { + app_build_id: Services.appinfo.appBuildID, + json_dump_metadata: { -+ hash: await RemoteSettingsWorker.getContentHash(bytes), ++ hash: await lazy.RemoteSettingsWorker.getContentHash(bytes), + size: bytes.length, + }, + } @@ -602,10 +607,10 @@ index eee1487491..90e82772c4 100644 remoteRecords, }; -- -2.37.0 +2.37.1 -From 9e4840347d561c7dc98ab6f84e3c3a195297c29e Mon Sep 17 00:00:00 2001 +From aa6967b7f10899464253074271f27180ca4069fe Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -623,45 +628,42 @@ false, it triggers a sync. Then adds a flag if the client has been correctly synchronized with the dump, so that no metadata checking occurs during the session. --- - services/settings/RemoteSettingsClient.jsm | 30 +++++++++++++++++++++- - 1 file changed, 29 insertions(+), 1 deletion(-) + services/settings/RemoteSettingsClient.jsm | 27 +++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index 90e82772c4..2a009eca7c 100644 +index 77da7304b6..81404d9801 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -16,6 +16,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { +@@ -23,6 +23,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.jsm", Database: "resource://services-settings/Database.jsm", + DeferredTask: "resource://gre/modules/DeferredTask.jsm", - Downloader: "resource://services-settings/Attachments.jsm", IDBHelpers: "resource://services-settings/IDBHelpers.jsm", KintoHttpClient: "resource://services-common/kinto-http-client.js", -@@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { + ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", +@@ -33,6 +34,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { }); const TELEMETRY_COMPONENT = "remotesettings"; +const DEFERRED_SYNC_DELAY_MILLISECONDS = 1000; - XPCOMUtils.defineLazyGetter(this, "console", () => Utils.log); + XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log); -@@ -249,6 +251,14 @@ class RemoteSettingsClient extends EventEmitter { +@@ -320,6 +322,11 @@ class RemoteSettingsClient extends EventEmitter { this._lastCheckTimePref = lastCheckTimePref; this._verifier = null; this._syncRunning = false; -+ this._deferredSync = new DeferredTask( -+ async () => { -+ if (!this._syncRunning && !(await this._isSynced())) { -+ await this.sync(); -+ } -+ }, -+ DEFERRED_SYNC_DELAY_MILLISECONDS -+ ); ++ this._deferredSync = new lazy.DeferredTask(async () => { ++ if (!this._syncRunning && !(await this._isSynced())) { ++ await this.sync(); ++ } ++ }, DEFERRED_SYNC_DELAY_MILLISECONDS); // This attribute allows signature verification to be disabled, when running tests // or when pulling data from a dev server. -@@ -278,6 +288,11 @@ class RemoteSettingsClient extends EventEmitter { +@@ -349,6 +356,11 @@ class RemoteSettingsClient extends EventEmitter { this.db.identifier = this.identifier; } @@ -673,7 +675,7 @@ index 90e82772c4..2a009eca7c 100644 get identifier() { return `${this.bucketName}/${this.collectionName}`; } -@@ -346,6 +361,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -417,6 +429,10 @@ class RemoteSettingsClient extends EventEmitter { let lastModified = await this.db.getLastModified(); let hasLocalData = lastModified !== null; @@ -684,7 +686,7 @@ index 90e82772c4..2a009eca7c 100644 if (syncIfEmpty && !hasLocalData) { // .get() was called before we had the chance to synchronize the local database. // We'll try to avoid returning an empty list. -@@ -444,7 +463,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -517,7 +533,10 @@ class RemoteSettingsClient extends EventEmitter { // No need to verify signature on JSON dumps. // If local DB cannot be read, then we don't even try to do anything, // we return results early. @@ -695,14 +697,14 @@ index 90e82772c4..2a009eca7c 100644 + return filtered; } - console.debug( -@@ -484,6 +506,12 @@ class RemoteSettingsClient extends EventEmitter { + lazy.console.debug( +@@ -557,6 +576,12 @@ class RemoteSettingsClient extends EventEmitter { return final; } + async _isSynced() { + this._synced ||= -+ Services.appinfo.appBuildID === (await this.db.getMetadata())?.app_build_id; ++ Services.appinfo.appBuildID === (await this.db?.getMetadata())?.app_build_id; + return this._synced; + } + @@ -710,10 +712,10 @@ index 90e82772c4..2a009eca7c 100644 * Synchronize the local database with the remote server. * -- -2.37.0 +2.37.1 -From 72de3dbe162430638a58838b714f1872c2dd8195 Mon Sep 17 00:00:00 2001 +From d38df88747ef8df356af5178fde18bf3a25836b6 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -735,34 +737,34 @@ noticeable performance issues. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index 2a009eca7c..dbcdb559df 100644 +index 81404d9801..c06650e2d8 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +@@ -20,6 +20,7 @@ const { Downloader } = ChromeUtils.import( + const lazy = {}; - XPCOMUtils.defineLazyModuleGetters(this, { - AppConstants: "resource://gre/modules/AppConstants.jsm", + XPCOMUtils.defineLazyModuleGetters(lazy, { + CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm", ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.jsm", Database: "resource://services-settings/Database.jsm", -@@ -1015,7 +1016,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1122,7 +1123,10 @@ class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); - if (r.last_modified != old.last_modified) { + if ( + r.last_modified != old.last_modified || -+ CanonicalJSON.stringify(r) != CanonicalJSON.stringify(old) ++ lazy.CanonicalJSON.stringify(r) != lazy.CanonicalJSON.stringify(old) + ) { syncResult.updated.push({ old, new: r }); } } else { -- -2.37.0 +2.37.1 -From 0ddc970c40569ca7b20ec67a413519589e7c52f6 Mon Sep 17 00:00:00 2001 +From f746bdc4a82e8a29ea8a5470cb5cdedba6594dbc Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -780,10 +782,10 @@ logic gets the data about the attachments from those records. 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index dbcdb559df..c20ce412b2 100644 +index c06650e2d8..d5d934447a 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -207,7 +207,7 @@ class AttachmentDownloader extends Downloader { +@@ -257,7 +257,7 @@ class AttachmentDownloader extends Downloader { allRecords .filter(r => !!r.attachment) .map(r => @@ -792,16 +794,16 @@ index dbcdb559df..c20ce412b2 100644 ) ); } -@@ -975,7 +975,7 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1082,7 +1082,7 @@ class RemoteSettingsClient extends EventEmitter { // Signature failed, clear local DB because it contains // bad data (local + remote changes). - console.debug(`${this.identifier} clear local data`); + lazy.console.debug(`${this.identifier} clear local data`); - await this.db.clear(); + await this._clearAll(); // Local data was tampered, throw and it will retry from empty DB. - console.error(`${this.identifier} local data was corrupted`); + lazy.console.error(`${this.identifier} local data was corrupted`); throw new CorruptedDataError(this.identifier); -@@ -997,7 +997,7 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1104,7 +1104,7 @@ class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -810,7 +812,7 @@ index dbcdb559df..c20ce412b2 100644 } } } -@@ -1037,6 +1037,12 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1144,6 +1144,12 @@ class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -824,10 +826,10 @@ index dbcdb559df..c20ce412b2 100644 * Fetch information from changeset endpoint. * -- -2.37.0 +2.37.1 -From 00e45ee5b33b5e6030fa2d3b589cce5418822a3e Mon Sep 17 00:00:00 2001 +From 3e2487052231283079591eb158d6f45b43f1c091 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -842,16 +844,16 @@ necessary cleanup. So remove the checks. 1 file changed, 5 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index c20ce412b2..79ec40ee9e 100644 +index d5d934447a..9a25d5103d 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -917,14 +917,9 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1024,14 +1024,9 @@ class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; - // If data wasn't changed, return empty sync result. - // This can happen when we update the signature but not the data. - console.debug( + lazy.console.debug( `${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}` ); - if (localTimestamp && remoteTimestamp < localTimestamp) { @@ -861,20 +863,20 @@ index c20ce412b2..79ec40ee9e 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.37.0 +2.37.1 -From 37d74c55d8c1d852666f179fe6ea45fd99ff83ca Mon Sep 17 00:00:00 2001 +From ba7f771d057358ae0575f0f392116b4406b6c1a5 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached --- - services/settings/Attachments.jsm | 35 +++++++------------------------ - 1 file changed, 8 insertions(+), 27 deletions(-) + services/settings/Attachments.jsm | 37 +++++++------------------------ + 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm -index 2bf846e4e1..542f34f97e 100644 +index 5ac6249f67..9dc7bcdbf0 100644 --- a/services/settings/Attachments.jsm +++ b/services/settings/Attachments.jsm @@ -151,9 +151,10 @@ class Downloader { @@ -915,7 +917,7 @@ index 2bf846e4e1..542f34f97e 100644 const { attachment: { filename, size, hash }, } = record; -@@ -357,31 +359,10 @@ class Downloader { +@@ -359,33 +361,10 @@ class Downloader { */ async downloadAsBytes(record, options = {}) { const { @@ -934,7 +936,9 @@ index 2bf846e4e1..542f34f97e 100644 - if (!checkHash) { - return buffer; - } -- if (await RemoteSettingsWorker.checkContentHash(buffer, size, hash)) { +- if ( +- await lazy.RemoteSettingsWorker.checkContentHash(buffer, size, hash) +- ) { - return buffer; - } - // Content is corrupted. @@ -951,10 +955,10 @@ index 2bf846e4e1..542f34f97e 100644 /** -- -2.37.0 +2.37.1 -From 5f475d79389de681e2eac63527a6d497b0b0da77 Mon Sep 17 00:00:00 2001 +From 1c0858235dd0f65b00ed622eac269d35c24ee458 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -979,10 +983,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index c487b04a35..b0808338ef 100644 +index 79267cded6..d67f43052a 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -12269,7 +12269,7 @@ +@@ -12446,7 +12446,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -992,10 +996,10 @@ index c487b04a35..b0808338ef 100644 - name: security.tls.version.min diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 12da07c56f..39f85cf5b3 100644 +index 0996c198d2..f8525a9325 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp -@@ -1453,6 +1453,7 @@ void nsNSSComponent::setValidationOptions( +@@ -1434,6 +1434,7 @@ void nsNSSComponent::setValidationOptions( CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled; CRLiteMode crliteMode = static_cast(StaticPrefs::security_pki_crlite_mode()); @@ -1004,5 +1008,5 @@ index 12da07c56f..39f85cf5b3 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.37.0 +2.37.1 diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index c45b97e..99c49df 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -122,14 +122,6 @@ diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/ index 4c59b84a7c..44d36d3b28 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -33,7 +33,6 @@ var gExceptionPaths = [ - "chrome://browser/content/assets/moz-vpn.svg", - "chrome://browser/content/assets/vpn-logo.svg", - "chrome://browser/content/assets/focus-promo.png", -- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg", - "chrome://browser/content/assets/klar-qr-code.svg", - - // These app marketplace icons are referenced based on the user's locale @@ -136,17 +135,6 @@ var whitelist = [ // extensions/pref/autoconfig/src/nsReadConfig.cpp { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, @@ -149,10 +141,10 @@ index 4c59b84a7c..44d36d3b28 100644 // layout/mathml/nsMathMLChar.cpp diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index 912d9edf08..dd4697a368 100644 +index 2131a15cee..dd4697a368 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn -@@ -14,12 +14,8 @@ browser.jar: +@@ -14,11 +14,8 @@ browser.jar: content/browser/preferences/containers.js content/browser/preferences/sync.js content/browser/preferences/experimental.js @@ -162,20 +154,8 @@ index 912d9edf08..dd4697a368 100644 content/browser/preferences/findInPage.js - content/browser/preferences/more-from-mozilla-qr-code-simple.svg - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg -- content/browser/preferences/more-from-mozilla-qr-code-advanced.svg content/browser/preferences/web-appearance-dark.svg content/browser/preferences/web-appearance-light.svg -diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg -deleted file mode 100644 -index 4848d3e20c..0000000000 ---- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg -+++ /dev/null -@@ -1,4 +0,0 @@ -- -- -\ No newline at end of file diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg deleted file mode 100644 index 5052db9702..0000000000 @@ -1066,10 +1046,10 @@ index e33c814f62..5698f2b3e9 100644

-diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js +diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs index 2417f1a641..698c48ccc3 100644 ---- a/browser/components/protections/content/vpn-card.js -+++ b/browser/components/protections/content/vpn-card.js +--- a/browser/components/protections/content/vpn-card.mjs ++++ b/browser/components/protections/content/vpn-card.mjs @@ -23,22 +23,6 @@ export default class VPNCard { vpnLink.addEventListener("click", () => { this.doc.sendTelemetryEvent("click", "vpn_card_link"); diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 0abf140..6565edb 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=102.0.1 +pkgver=103.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -75,8 +75,10 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb python-setuptools python-zstandard lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) -[[ "${CARCH}" == 'armv7h' ]] && makedepends+=( ${makedepends[*]/wasi*/} ) -makedepends_i686=(gcc10) +[[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler +[[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin +[[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) +[[ "${CARCH}" == 'i686' ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -86,7 +88,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - cbindgen-0.24.0.diff zstandard-0.18.0.diff + zstandard-0.18.0.diff $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -100,17 +102,16 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('7bba6ffd6e8e42d5c38aa2a453f5fa30dfc9ef150f2175aa0625edb68fddae70' +sha256sums=('acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773' 'SKIP' - '4628d136c3beada292e83cd8e89502cac4aa3836851b34259a665582a7713978' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' - '77b79ce95a560d371b08925a4f8c005b38e45936f61c8e4a4378d5ac56313cba' + '1c385fa5b2e2dd1cb7404c2d101de499a6b4b1324ddc051c5fb94aea6c24b42a' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' - 'a6a0bf8296d42a0ea2664efd45e9131df1f19fc6199724ec78d66119589850dd' + '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') @@ -135,7 +136,7 @@ validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger # disable PGO for 32-bit arches -_should_skip_pgo=0 # for x86_64 +_should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely) [[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] || _should_skip_pgo=1 @@ -209,9 +210,6 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # Unbreak build with cbindgen 0.24.0 - patch -Np1 -i ../cbindgen-0.24.0.diff - # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff @@ -323,11 +321,11 @@ ac_add_options --disable-rust-simd ac_add_options --enable-strip ac_add_options --disable-debug ac_add_options --disable-debug-symbols -export CC=gcc-10 -export CXX=g++-10 -export AR=gcc-ar-10 -export NM=gcc-nm-10 -export RANLIB=gcc-ranlib-10 +export CC=gcc +export CXX=g++ +export AR=gcc-ar +export NM=gcc-nm +export RANLIB=gcc-ranlib export STRIP=strip END @@ -492,6 +490,7 @@ END echo "applying 9004-FSDG-misc.patch" patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9004-FSDG-misc.patch rm toolkit/crashreporter/tools/upload_symbols.py + rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/**/*.a ## patching sanity checks ## From 360eee093d3f0e9aada99f52e9629c9c60e1b02e Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Aug 02 2022 04:03:53 +0000 Subject: [PATCH 48/200] [libreboot-utils]: upgrade to v4.15.libreboot20220710 --- diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index 544b590..54efd8e 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,23 +4,23 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=15 -_upstream_ver=20211122 +pkgrel=1 +_upstream_ver=20220710 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" url="https://libreboot.org/" arch=('x86_64' 'i686' 'armv7h') license=('GPL2') -makedepends=('pciutils' 'python' 'python-setuptools') +makedepends=('pciutils' 'python' 'python-setuptools' 'flex') _mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request -source=("${_mirror}/testing/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} +source=("${_mirror}/stable/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} "0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch") -sha256sums=('e8a610e51e668c34627a6d9c048c554592fd2c2ab4dbcad83c85c06d132e5ad1' - '4442fc225383e1edf8f45e1aecba81868ae43db19978f15c17828389364c0434' +sha256sums=('92439034828aa66d52507c97d8260a7d0335abbeedb1a70e5e1466b92a903645' + 'e8afb35e6d9328baa5cee5325c60cb40467559596e93a7ae218883ece3484b8f' 'SKIP') -sha512sums=('3eac75b33bc6d2874c3ca1ad2392db7287992cf91d37879bb3244dbd6716bc7ffa3f8d31e15d821899e91a55b6fe665d918bea4e9da92e5e98345e9bcbe1bb95' - '3a532ecef550ef27b723845544e91ff6b13ed6f2f1188d40fdeb7b3c416be619ff58103c3b01cd52ff88c28df6d419d2113b92d0b8ba36d1a74cfc16f70e0e63' +sha512sums=('73fe77983d30997295747e365a363f6fc4897f469d9b24640fc6a7105f0ddb623890e797723077222212695dbbe9abb5186b04d75dad39f99cb62733f4b0de60' + 'aa4f35df0da8e93dda169034e906576db291ac2e6fe27b5c9693827ff99ecaa8c45b80892f0792505fb1d9c6d5190517a59309304f93c3e1f504ddacf95684c1' 'SKIP') validpgpkeys=('98CCDDF8E56047F475C044BDD0C62464FA8B4856') # Leah Rowe From 5b26c38c2a93c12ee356d1c629b7d584340787e9 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Aug 02 2022 04:55:10 +0000 Subject: [PATCH 49/200] [gmid]: upgrade to v1.8.4 --- diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD index 073881e..0e734d6 100644 --- a/pcr/gmid/PKGBUILD +++ b/pcr/gmid/PKGBUILD @@ -4,25 +4,22 @@ # parabola changes and rationale: -# - delete unlicensed files # - add openrc service files pkgname=gmid -pkgver=1.8.3 -pkgrel=3 +pkgver=1.8.4 +pkgrel=1 pkgdesc='Fast Gemini server written with security in mind.' arch=('x86_64') arch+=('i686' 'armv7h') url='https://gmid.omarpolo.com' -license=('ISC') +license=('custom:ISC') install=${pkgname}.install backup=(etc/conf.d/${pkgname} etc/${pkgname}.conf) depends=('libretls' 'libevent') -mksource=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz) -source=( - https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz{,.sig} +source=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz "gmid.service" "gmid.sysusers" "gmid.confd" @@ -30,10 +27,8 @@ source=( "gmid.conf" "index.gmi" ) -mksha256sums=('f7b6cc1deaea6c5242301fa7440c0f5caaf282fea780ba1edcef480f7fa67fe1') sha256sums=( - '5a7ad3ef93434b8a42f18bffe93444de9d30360e4c799dcadac844374e2046ca' - 'SKIP' + 'abecdec3bfc2f2deac9d57b84e43334484fc537e5086a3c061f07f6311c89d2f' '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94' '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6' 'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3' @@ -41,26 +36,19 @@ sha256sums=( '7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6' '361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139' ) -validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger -mksource() { - cd "$srcdir/$pkgname-$pkgver" - - # Remove unlicensed files. - rm -r contrib - rm -r site -} - build() { cd "$srcdir/$pkgname-$pkgver" + MANDIR='usr/share/man/' ./configure --prefix='usr/' make } package() { - # Install the config and service files. cd "$srcdir" + + # Install the config and service files. install -Dm644 gmid.service -t "$pkgdir/usr/lib/systemd/system" install -Dm644 gmid.sysusers -t "$pkgdir/usr/lib/sysusers.d" install -Dm644 gmid.confd "$pkgdir/etc/conf.d/gmid" From ab31af4bfdef39d094c9bd6afe9d7c86dbef72eb Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 02 2022 04:55:11 +0000 Subject: [PATCH 50/200] restore mksource() --- diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD index 0e734d6..3ca5a5f 100644 --- a/pcr/gmid/PKGBUILD +++ b/pcr/gmid/PKGBUILD @@ -4,6 +4,7 @@ # parabola changes and rationale: +# - delete unlicensed files # - add openrc service files @@ -19,7 +20,9 @@ install=${pkgname}.install backup=(etc/conf.d/${pkgname} etc/${pkgname}.conf) depends=('libretls' 'libevent') -source=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz +mksource=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz) +source=( + https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz{,.sig} "gmid.service" "gmid.sysusers" "gmid.confd" @@ -27,8 +30,10 @@ source=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pk "gmid.conf" "index.gmi" ) +mksha256sums=('0') # libre source-ball was not needed for this release sha256sums=( 'abecdec3bfc2f2deac9d57b84e43334484fc537e5086a3c061f07f6311c89d2f' + 'SKIP' '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94' '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6' 'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3' @@ -36,8 +41,29 @@ sha256sums=( '7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6' '361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139' ) +validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger +# NOTE: The files removed in mksource() are not actually present in this release +# However, mksource() is retained for now, +# because it is not certain that the files will be absent in the next release; +# or perhaps their omission from this release was a happy accident. +mksource() { + cd "$srcdir/$pkgname-$pkgver" + + # Remove unlicensed files + local nonfree_files=( contrib site ) + for nonfree_file in "${nonfree_files[@]}" + do if [[ -d ${nonfree_file} ]] + then + rm -r ${nonfree_file} + else + echo "cannot delete '${nonfree_file}' - mksource() needs re-working" + return 1 + fi + done +} + build() { cd "$srcdir/$pkgname-$pkgver" From 997bab9bc72ba58219c5dcf3851cdb0e243cdf79 Mon Sep 17 00:00:00 2001 From: David P Date: Aug 02 2022 23:18:03 +0000 Subject: [PATCH 51/200] linux-libre-pck: disable broken CONFIG_TCP_CONG_BBR on armv7h Signed-off-by: David P --- diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD index 51869b1..035825f 100644 --- a/libre/linux-libre-pck/PKGBUILD +++ b/libre/linux-libre-pck/PKGBUILD @@ -81,7 +81,7 @@ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbeb 'f47bcdd8d32b0b2ff1c58d552e2fe83047b6aa183ba03670dfd4e0f1f27eec6808eab53904847b316d8e31c85b4d63a7f365c6a91008a6d6cbcf89639073a880' '1f247490ca428c372194838919ba049e61f357249419998692c3a20cc6728d509b079f39f3edcc0f76342c437a350d28eefafe8aa743477cecbfff1bb43ea8bb' '88369e64e767fe490c22a221a55a5aa51377995897b7462320d53d64c9e83cb57fba3ea8ec591f15263905f86dc9f23cca0492cbb6a562aeb1a0fab0f8e447cf' - '5bb7e9ed49793941ad078a4a8e1f711af0e47f2707fa56da9c913a0069a913264b620858a5ceb36d4fa6cd9788e41be42ea81e1626762035ded5b28b0c299792' + '959f644c82015be6ddf0b84100b24d48a8208af7374d3ae748226e45ca592970354d20125df8cad2d71369c3d9d950f930776263dde8ce222d1afd571af331eb' '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168') diff --git a/libre/linux-libre-pck/config.armv7h b/libre/linux-libre-pck/config.armv7h index 4a1a5eb..5f4e4c3 100644 --- a/libre/linux-libre-pck/config.armv7h +++ b/libre/linux-libre-pck/config.armv7h @@ -1152,7 +1152,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_DCTCP=m CONFIG_TCP_CONG_CDG=m -CONFIG_TCP_CONG_BBR=m +# CONFIG_TCP_CONG_BBR is not set # CONFIG_TCP_CONG_BBR2 is not set CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set From e93fd4a48d2404163cbbc5cb56452c31da0f8169 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:10 +0000 Subject: [PATCH 52/200] [parabola-hackers]: upgrade to v20220802 --- diff --git a/libre/parabola-hackers/PKGBUILD b/libre/parabola-hackers/PKGBUILD index 0d152bf..8f49df0 100644 --- a/libre/parabola-hackers/PKGBUILD +++ b/libre/parabola-hackers/PKGBUILD @@ -1,17 +1,18 @@ +# SPDX-License-Identifier: CC0-1.0 # Maintainer: Luke Shumaker # Contributor: bill-auger pkgbase=parabola-hackers pkgname=(parabola-hackers parabola-hackers-nshd) -pkgver=20210719 +pkgver=20220802 pkgrel=1 pkgdesc='Programs for doing magic with hackers.git' url='https://git.parabola.nu/packages/parabola-hackers.git/' license=('GPL') arch=('armv7h' 'i686' 'x86_64') -makedepends=('go' 'git') +makedepends=('git' 'go') source=("parabola-hackers::git://git.parabola.nu/packages/parabola-hackers.git#tag=v${pkgver}") _go_sources=("git.lukeshu.com/go/libgnulinux#branch=master" "git.lukeshu.com/go/libnslcd#branch=master" From c87bf0d109feea94f1b2acc4f374c7abbdec37c3 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:19 +0000 Subject: [PATCH 53/200] [parabola-keyring][your-freedom]: housekeeping --- diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 60f6561..5524e33 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,5 +1,5 @@ # SPDX-License-Identifier: CC0-1.0 -# Maintainer: Parabola automatic package builder +# Maintainer: Parabola Hackers # NOTE: This PKGBUILD does not need to be edited manually. @@ -8,33 +8,45 @@ # eg: $ git commit --allow-empty --message=rebuild # $ git push parabola master # The autobuilder will modify this PKGBUILD, -# replacing $pkgver, $_gitver, and the checksum (updpkgsums), +# replacing $pkgver and $_gitver, # build and publish the package, # and commit the modified PKGBUILD to abslibre. pkgname=parabola-keyring pkgver=20220714 -_gitver=374d9b5b110ddfe715419b10caa4de2972aed162 +_gitver=374d9b5b110ddfe715419b10caa4de2972aed162 pkgrel=1 -pkgdesc='Parabola GNU/Linux-libre PGP keyring' -arch=('any') -url='https://git.parabola.nu/hackers.git/' -license=('GPL') -makedepends=(parabola-hackers git) +pkgdesc="Parabola GNU/Linux-libre PGP keyring" +arch=(any) +url=https://wiki.parabola.nu/Parabola_Keyring +license=(GPL) + +makedepends=(git parabola-hackers) install=$pkgname.install -source=("hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}") +source=(hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}) + sha512sums=('SKIP') -prepare() { - cd "$srcdir" - mv {,.}hackers-$_gitver - mkdir .cachedir - export PARABOLA_HACKERS_YAMLDIR="$PWD/.hackers-$_gitver/users" +prepare() +{ + # network check + # NOTE: this is the only parabola PKGBUILD, which requires internet access in the build chroot + # the pacman-make-keyring procedure was originally in a mksource() function, + # presumably for that reason; but that o/c removed the requirement only from users + # TODO: it would be great to re-implement this, so that it does not + # there is a WIP on the parabola-hackers.git 'wip-import-keys-from-hackers-git' branch + local net_check_url=https://repo.parabola.nu/check_network_status.txt + local net_err_msg="ERROR: this PKGBUILD requires internet access in the build chroot" + curl ${net_check_url} &> /dev/null || ! echo "${net_err_msg}" || return 1 +} - local net_err_msg="ERROR: this PKGBUILD requires the build host to be connected to the internet" - curl www.parabola.nu &> /dev/null || ! echo "${net_err_msg}" || return 1 +build() +{ + mv {,.}hackers-${_gitver} + mkdir .cachedir + export PARABOLA_HACKERS_YAMLDIR="${PWD}"/.hackers-${_gitver}/users # NOTE: the current 'parabola-hackers' package does not yet recognize # the 'keyserver' env-var - the keyserver is still hard-coded; @@ -44,14 +56,15 @@ prepare() { # TODO: remove this note, after 'parabola-hackers' has been rebuilt # NOTE: the rebuilt 'parabola-hackers' is now in [libre-testing] /usr/lib/parabola-hackers/pacman-make-keyring \ - V="$pkgver" \ - keyserver='hkp://pgp.cyberbits.eu:11371' \ - cachedir="$PWD/.cachedir" + V=${pkgver} \ + keyserver=hkp://pgp.cyberbits.eu:11371 \ + cachedir="${PWD}/.cachedir" } -package() { - cd "$srcdir" - bsdtar xf "$pkgname-$pkgver.tar.gz" - cd "$srcdir/$pkgname-$pkgver" +package() +{ + bsdtar xf ${pkgname}-${pkgver}.tar.gz + cd ${pkgname}-${pkgver} + make PREFIX=/usr DESTDIR="${pkgdir}" install } diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index c8ae458..dbec244 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -15,13 +15,13 @@ pkgname=your-freedom pkgver=20220508 _gitver=c3a0d49f9f95503ed41feed32efbfd8b38401852 pkgrel=1 -pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free." +pkgdesc="This meta-package conflicts with every known non-free Arch package, to ensure that your system is libre" license=(GPL3) url=https://wiki.parabola.nu/Blacklist arch=(any) -install=${pkgname}.install makedepends=(librelib) +install=${pkgname}.install source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) sha256sums=('53e27f1b6ef1042e2377a710b5faf8edfa4a63efeee082702dac15aa1cb1e550') From 70334cf0aab04b1d59b3bba2336cfca439a62959 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:23 +0000 Subject: [PATCH 54/200] [parabola-keyring]: rebuild --- diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 5524e33..f1522dd 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -14,7 +14,7 @@ pkgname=parabola-keyring -pkgver=20220714 +pkgver=20220802 _gitver=374d9b5b110ddfe715419b10caa4de2972aed162 pkgrel=1 pkgdesc="Parabola GNU/Linux-libre PGP keyring" @@ -23,6 +23,7 @@ url=https://wiki.parabola.nu/Parabola_Keyring license=(GPL) makedepends=(git parabola-hackers) +makedepends=( ${makedepends[*]/parabola-hackers/parabola-hackers>=20220802-1} ) # in libre-testing install=$pkgname.install source=(hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}) @@ -53,7 +54,8 @@ build() # and it is now invalid - 'parabola-hackers' must be rebuilt for this; # but that build currently has a problem - the autobuilder handles # this now, via an un-published kludge in the autobuild.sh script - # TODO: remove this note, after 'parabola-hackers' has been rebuilt + # TODO: remove this note and the version constraint, + # after 'parabola-hackers' has been rebuilt # NOTE: the rebuilt 'parabola-hackers' is now in [libre-testing] /usr/lib/parabola-hackers/pacman-make-keyring \ V=${pkgver} \ From b89841b6da141b8956c24d142f72b0ff5937a572 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:24 +0000 Subject: [PATCH 55/200] [pacman]: bugfix checksums --- diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index aab8eff..e37c193 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -47,9 +47,6 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig source=( ${source[*]/pacman.conf/} $(printf "pacman.conf.%s\n" "${arch[@]}" | sort) ) # pacman.conf.{armv7h,i686,x86_64} source=( ${source[*]/makepkg.conf/makepkg.conf.in} ) # makepkg.conf.in source+=(dummy.conf - pacman-keyring.service - pacman-keyring.timer - pacman-keyring.initd 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch) source_armv7h=(0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch @@ -61,13 +58,10 @@ sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731' '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278' '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a' '20e9de1b612c3f24736e76a753cd38b7ea0f80160185012a538a77297acfb31f' # makepkg.conf.in - '655a1e9a198ccd93313d26327fd20c4d7e4a630840c6e5615143953d2418c3d6' # pacman.conf.armv7h - 'f8069c81ddcba59fce6884002f5f40374859dd60610bae1ff99f93827b796e80' # pacman.conf.i686 - '748310c1c63dd9d4da2c452938757f82345a0bc0da520968c30048105bbe9b46') # pacman.conf.x86_64 -sha256sums+=('ab10d0156ef1f7cd67c5e7365687f754020ae3b4ab79a23a1882cd78ede15fb3' - '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d' - '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6' - '3a0115c5441e565eab0f72e4154440e640be6317cfa13dee0f36b058f63e1774' + 'ba97c17a2d994b69617d89dd57c774189c9af99d89ccf78615dec2feefada25e' # pacman.conf.armv7h + 'a9745669798187ae1862481eceda93691d64c48c8198b06b9df85fa6f21966de' # pacman.conf.i686 + 'aac3d5414de69f8cd3126adc85066299c8f6149bd12dffceb1049e124aab6f34') # pacman.conf.x86_64 +sha256sums+=('8fca32bf5ee85b67c93983d7e1c93734de5e715b3bb732f7e48b88da7844f94b' '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8') sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' From d054377af1728f5feb6488d3c7992de150ca1dd8 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:24 +0000 Subject: [PATCH 56/200] [pacman]: add keyring updatedb patch --- diff --git a/libre/pacman/9002-pacman-key-updatedb.patch b/libre/pacman/9002-pacman-key-updatedb.patch new file mode 100644 index 0000000..c134ba8 --- /dev/null +++ b/libre/pacman/9002-pacman-key-updatedb.patch @@ -0,0 +1,16 @@ +this helps to ensure that an expired key will be trusted again, +immediately after the updated keyring package is installed + +diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in +index f7f1dd6..c5fb73f 100644 +--- a/scripts/pacman-key.sh.in ++++ b/scripts/pacman-key.sh.in +@@ -599,7 +599,7 @@ verify_sig() { + + updatedb() { + msg "$(gettext "Updating trust database...")" +- if ! "${GPG_PACMAN[@]}" --batch --check-trustdb ; then ++ if ! "${GPG_PACMAN[@]}" --batch --check-trustdb --yes ; then + error "$(gettext "Trust database could not be updated.")" + exit 1 + fi diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index e37c193..09d4e12 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -16,7 +16,7 @@ pkgname=pacman pkgver=6.0.1 pkgrel=4 -pkgrel+=.parabola2 +pkgrel+=.parabola3 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') arch+=('armv7h' 'i686') @@ -47,7 +47,8 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig source=( ${source[*]/pacman.conf/} $(printf "pacman.conf.%s\n" "${arch[@]}" | sort) ) # pacman.conf.{armv7h,i686,x86_64} source=( ${source[*]/makepkg.conf/makepkg.conf.in} ) # makepkg.conf.in source+=(dummy.conf - 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch) + 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + 9002-pacman-key-updatedb.patch) source_armv7h=(0001-Sychronize-filesystem.patch 0002-Revert-close-stdin-before-running-install-scripts.patch 0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch) @@ -62,7 +63,8 @@ sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731' 'a9745669798187ae1862481eceda93691d64c48c8198b06b9df85fa6f21966de' # pacman.conf.i686 'aac3d5414de69f8cd3126adc85066299c8f6149bd12dffceb1049e124aab6f34') # pacman.conf.x86_64 sha256sums+=('8fca32bf5ee85b67c93983d7e1c93734de5e715b3bb732f7e48b88da7844f94b' - '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8') + '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8' + '98396eba73b305da7e86a163bb1fcb5ff2cb2c5dd1e0ccf09fd1e7e0222fe3c5') sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc' '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9' '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb') @@ -83,6 +85,7 @@ prepare() { # From Parabola patch -p1 -i ../9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch + patch -p1 -i ../9002-pacman-key-updatedb.patch # Generate the architecture-specific makepkg.conf files local carch mycarch mychost myflags myldflags From 192181c9fd0da91f6a3ff5b679b1ba1c718bdc56 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:25 +0000 Subject: [PATCH 57/200] [pacman]: neutralize tests requiring network access --- diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 09d4e12..6e7d6c8 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -11,6 +11,7 @@ # parabola changes and rationale: # - adapt config files to support multiple arches # - allow pacstrap to create cross-arch chroots +# - disable tests requiring networking pkgname=pacman @@ -122,6 +123,14 @@ prepare() { -e "s|@CARCHFLAGS[@]|$myflags|g" \ -e "s|@LDFLAGS[@]|$myldflags|g" done + + # neutralize tests requiring networking + local net_check_url=https://repo.parabola.nu/check_network_status.txt + local sed_rx="s|xfail_tests = {|&\ + 'tests/sync-failover-404-with-body.py': true,\ + 'tests/upgrade-download-pkg-and-sig-with-filename.py': true,\ + 'tests/upgrade-download-pkg-and-sig-without-filename.py': true,|" + curl ${net_check_url} &> /dev/null || sed -i "${sed_rx}" test/pacman/meson.build } build() { From 5cc52aa0ae255b4cb091544106488aa5a936af5a Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:25 +0000 Subject: [PATCH 58/200] [pacman]: tweak for armv7h --- diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 6e7d6c8..5349428 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -92,6 +92,18 @@ prepare() { local carch mycarch mychost myflags myldflags for carch in "${arch[@]}"; do case $carch in + aarch64) + mycarch="aarch64" + mychost="aarch64-unknown-linux-gnu" + myflags="-march=armv8-a " + ;; + armv7h) + mycarch="armv7h" + mychost="armv7l-unknown-linux-gnueabihf" + myflags="-march=armv7-a -mfloat-abi=hard -mfpu=neon -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection" + ;; i686) mycarch="i686" mychost="i686-pc-linux-gnu" @@ -106,17 +118,10 @@ prepare() { -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -fstack-clash-protection -fcf-protection" ;; - armv7h) - mycarch="armv7h" - mychost="armv7l-unknown-linux-gnueabihf" - myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection" - ;; esac myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" - # set things correctly in the default conf file + # configure the per-arch default makepkg.conf files sed < "$srcdir/makepkg.conf.in" > "$srcdir/makepkg.conf.$carch" \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ @@ -144,6 +149,12 @@ build() { -Dldconfig=/usr/bin/ldconfig \ build + # FIXME: armv7h fails building doxygen + # terminate called after throwing an instance of 'ghc::filesystem::filesystem_error' + # what(): Value too large for defined data type: '/build/pacman/src' + # qemu: uncaught target signal 6 (Aborted) - core dumped + [[ "${CARCH}" != armv7h ]] || meson configure -Ddoxygen=disabled build + meson compile -C build } From 4e94c55f3dea2521e6c7615e486139fd1e1dec84 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:14:26 +0000 Subject: [PATCH 59/200] [noisy-git]: add package --- diff --git a/pcr/noisy-git/PKGBUILD b/pcr/noisy-git/PKGBUILD new file mode 100644 index 0000000..f0eff9f --- /dev/null +++ b/pcr/noisy-git/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer (aur): Łaurent ʘ❢Ŧ Ŧough + +# derived (very loosely) from 'noisy-py3-git' + +# parabola changes and rationale: +# * build for arch=any +# * build from source-ball instead of VCS +# upstream has no releases; but the script has not changed since 2018 +# * simplified sed commands +# * do not install GPL and other useless files +# * install README to docs/ + + +pkgname=noisy-git +pkgver=20180908 +pkgrel=1 +pkgdesc="Simple random DNS, HTTP/S internet traffic noise generator" +arch=(any) +url=https://github.com/1tayH/noisy +license=(GPL3) + +_gitver=c21e7682d5626d96d0f6ee56a5ed749078d34aac +depends=(python-requests) +source=(noisy-${pkgver}.zip::https://github.com/1tayH/noisy/archive/${_gitver}.zip) + +sha256sums=('1d23778579bb6c0d4ee2063bbc3bb8114426dc350a43b80a5cd086c7381031b9') + + +prepare() +{ + cd "${srcdir}"/noisy-${_gitver} + + sed -i 's|User=noisy|DynamicUser=yes|' examples/systemd/noisy.service + sed -i 's|/opt/noisy/noisy.py|/usr/bin/noisy.py|' examples/systemd/noisy.service + sed -i 's|/opt/noisy|/usr/share/noisy|g' examples/systemd/noisy.service +} + +package() +{ + cd "${srcdir}"/noisy-${_gitver} + + install -Dm755 noisy.py "${pkgdir}"/usr/bin/noisy.py + install -Dm644 examples/systemd/noisy.service "${pkgdir}"/usr/lib/systemd/system/noisy.service + install -Dm644 README.md "${pkgdir}"/usr/share/doc/noisy/README.md + install -Dm644 config.json "${pkgdir}"/usr/share/noisy/config.json +} From c35d72a9c1db924034899f9c0df75f3726997ac8 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 08 2022 16:58:40 +0000 Subject: [PATCH 60/200] [noisy]: add missing shebang --- diff --git a/pcr/noisy-git/PKGBUILD b/pcr/noisy-git/PKGBUILD index f0eff9f..298c90d 100644 --- a/pcr/noisy-git/PKGBUILD +++ b/pcr/noisy-git/PKGBUILD @@ -33,6 +33,9 @@ prepare() sed -i 's|User=noisy|DynamicUser=yes|' examples/systemd/noisy.service sed -i 's|/opt/noisy/noisy.py|/usr/bin/noisy.py|' examples/systemd/noisy.service sed -i 's|/opt/noisy|/usr/share/noisy|g' examples/systemd/noisy.service + + # add missing shebang + sed -i '0,/.*/ s|\(.*\)|#!/usr/bin/env python\n\n\1|' noisy.py } package() From bf19cb35ba1986ff3e93ed0bc4c0871f7f235174 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 22 2022 16:38:42 +0000 Subject: [PATCH 61/200] [iceweasel][networkmanager][systemd]: housekeeping --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 6565edb..c6afb8d 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -598,7 +598,6 @@ END echo "Removing instrumented browser..." ./mach clobber - echo "Building optimized browser..." cat >.mozconfig ../mozconfig - < -# Maintainer (Arch): Dave Reisner -# Maintainer (Arch): Tom Gundersen +# Maintainer (arch): Christian Hesse +# Maintainer (arch): Dave Reisner +# Maintainer (arch): Tom Gundersen # Maintainer: Luke Shumaker # Contributor: Omar Vega Ramos # Contributor: Denis 'GNUtoo' Carikli diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD index 4061ccf..43f4590 100644 --- a/nonsystemd/networkmanager/PKGBUILD +++ b/nonsystemd/networkmanager/PKGBUILD @@ -1,9 +1,11 @@ -# Maintainer: Nathan Owens +# Maintainer (arch): Jan Alexander Steffens (heftig) +# Maintainer (artix): Nathan Owens # Contributor: Jan de Groot # Contributor: Wael Nasreddine # Contributor: Tor Krill # Contributor: Will Rea # Contributor: Valentine Sinitsyn +# Maintainer: Parabola Hackers pkgbase=networkmanager pkgname=(networkmanager libnm nm-cloud-setup) @@ -13,14 +15,15 @@ pkgrel+=.nonsystemd1 pkgdesc="Network connection manager and user applications" url="https://networkmanager.dev/" arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) license=(GPL) _pppver=2.4.9 makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl - elogind libmm-glib libnewt libndp libteam nftables vala perl-yaml + systemd libmm-glib libnewt libndp libteam nftables vala perl-yaml python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq openresolv libpsl audit meson) +makedepends=( ${makedepends[*]/systemd/elogind} ) checkdepends=(libx11 python-dbus) options=(debug) _commit=abfd2d6ea729926bff0ddafa1367a54f6d6f4230 # tags/1.38.2^0 @@ -94,7 +97,8 @@ _pick() { package_networkmanager() { depends=(libnm iproute2 wpa_supplicant libmm-glib libnewt libndp libteam curl - bluez-libs libpsl audit mobile-broadband-provider-info elogind) + bluez-libs libpsl audit mobile-broadband-provider-info) + depends+=(elogind) optdepends=( 'polkit: let non-root users control networking' 'dnsmasq: connection sharing' @@ -151,8 +155,9 @@ END package_libnm() { pkgdesc="NetworkManager client library" - depends=(glib2 nss util-linux-libs jansson libelogind) license=(LGPL) + depends=(glib2 nss util-linux-libs jansson systemd-libs) + depends=( ${depends[*]/systemd-libs/libelogind} ) provides=(libnm.so) mv libnm/* "$pkgdir" @@ -164,5 +169,3 @@ package_nm-cloud-setup() { mv nm-cloud-setup/* "$pkgdir" } - -# vim:set sw=2 et: From a79f8c91ed1d3db818b394e3e1ff4002f5e911c3 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 22 2022 16:38:42 +0000 Subject: [PATCH 62/200] [parabola-base]: add icu-compat --- diff --git a/libre/parabola-base/PKGBUILD b/libre/parabola-base/PKGBUILD index 3479497..d8bb2b6 100644 --- a/libre/parabola-base/PKGBUILD +++ b/libre/parabola-base/PKGBUILD @@ -18,8 +18,8 @@ license=('GPL') # (obsolete 'base' group) - ('libre/base' meta-package) + posix depends=(cryptsetup dialog dhcpcd inetutils jfsutils linux-libre logrotate lvm2 - mdadm netctl posix reiserfsprogs sysfsutils usbutils vi xfsprogs) # TODO: your-system-sanity + mdadm netctl posix reiserfsprogs sysfsutils usbutils vi xfsprogs) -# supplemental package-set for the systemd CLI LiveISOs -depends+=(bash-completion elinks haveged hdparm mc nano networkmanager ntp - openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip) +# supplemental package-set (eg: the systemd CLI LiveISOs) +depends+=(bash-completion links haveged hdparm icu-compat mc nano networkmanager + ntp openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip) From 26e8f3f3f03d7be3235be969c30accf936e784aa Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 22 2022 16:43:40 +0000 Subject: [PATCH 63/200] [rtl8812au]: remove package --- diff --git a/pcr/rtl8812au/PKGBUILD b/pcr/rtl8812au/PKGBUILD deleted file mode 100644 index b4e6141..0000000 --- a/pcr/rtl8812au/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# Maintainer: Parabola Hackers - - -_pkgbase=rtl8812au -pkgname=rtl8812au-dkms -pkgver=5.6.4.2.20220606 # per upstream dkms.conf (see note in prepare()) -_cid=cab4e4ec56884f65e0c279c1b5ceaf70dbe79be0 -pkgrel=3 -pkgdesc="RTL8812AU/21AU and RTL8814AU driver with monitor mode and frame injection" -url=https://github.com/aircrack-ng/rtl8812au -license=(GPL2) -arch=(armv7h i686 x86_64) - -makedepends=() -depends=(dkms) - -source=(${_pkgbase}-${pkgver}.tar.gz::https://github.com/aircrack-ng/rtl8812au/archive/${_cid}.tar.gz - dkms.conf) - -sha256sums=(20b498bc597e5343ee6c240eabd45c36894db86c76f6bfc100448c8b9c420733 - 9f7c983df45db1938ee924b2dac8e8d98becef78822536b6c8f489a56a25c6a4) - -case "${CARCH}" in -armv7h ) export KARCH=arm ;; -aarch64) export KARCH=arm64 ;; # TODO: not yet supported -esac - - -prepare() -{ - cd "${srcdir}"/${_pkgbase}-${_cid} - - # version sanity check - # NOTE: The upstream does not publich versioned releases, nor use git tags. - # However they are kind enough to version the dkms.conf. - # eg: PACKAGE_VERSION="5.6.4.2~20220715" - # This PKGBUILD attempts to version the package properly, based on - # that version ID (aka: pkgver) and the VCS commit (aka: _cid) which defined it. - local upstream_ver=$(grep PACKAGE_VERSION= dkms.conf | sed 's|PACKAGE_VERSION="\(.*\)"|\1|') - [[ "${upstream_ver/\~/.}" == ${pkgver} ]] || ! echo "version mismatch in dkms.conf" || return 1 - - # we will use our dkms.conf though - cp "${srcdir}"/dkms.conf . - - case "${CARCH}" in - armv7h) - sed -i 's|^CONFIG_PLATFORM_I386_PC = y|CONFIG_PLATFORM_I386_PC = n|' Makefile - sed -i 's|^CONFIG_PLATFORM_ARM_SUN7I = n|CONFIG_PLATFORM_ARM_SUN7I = y|' Makefile - sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |" dkms.conf - ;; - aarch64) - sed -i "s|^MAKE\[0\]=\"|MAKE[0]=\"ARCH=${KARCH} |" dkms.conf - ;; - esac - sed -i -e "s/@PKGBASE@/${_pkgbase}/" -e "s/@PKGVER@/${pkgver}/" dkms.conf - - # cleanup some sources that we won't need - # the licensing of files under the tools/ directory is varied and unclear - # TODO: this could/should go into a mksource() function - rm -rf android/ tools/ -} - -package() -{ - cd "${srcdir}"/${_pkgbase}-${_cid} - - local dkms_srcdir="${pkgdir}"/usr/src/${_pkgbase}-${pkgver} - - # Install - # Makefile does not respect DESTDIR - # make DESTDIR="${pkgdir}" install - - # Copy dkms.conf - install -Dm644 dkms.conf "${dkms_srcdir}"/dkms.conf - - # Set name and version - # already did that - - # Copy sources (including Makefile) - cp -r ./* "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/ - - # install docs - install -Dm644 README.md "${pkgdir}"/usr/share/doc/${_pkgbase}/README.md - install -m644 docs/* "${pkgdir}"/usr/share/doc/${_pkgbase}/ -} diff --git a/pcr/rtl8812au/dkms.conf b/pcr/rtl8812au/dkms.conf deleted file mode 100644 index e996e64..0000000 --- a/pcr/rtl8812au/dkms.conf +++ /dev/null @@ -1,9 +0,0 @@ -PACKAGE_NAME="@PKGBASE@" -PACKAGE_VERSION="@PKGVER@" -BUILT_MODULE_NAME="88XXau" -PROCS_NUM=$(nproc) -[ $PROCS_NUM -gt 16 ] && PROCS_NUM=16 -MAKE="'make' -j$PROCS_NUM KVER=${kernelver} KSRC=/lib/modules/${kernelver}/build" -CLEAN="'make' clean" -DEST_MODULE_LOCATION="/kernel/drivers/net/wireless" -AUTOINSTALL="yes" From daa587973056a9759c2acfb694901cf68824ffc6 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 22 2022 16:43:50 +0000 Subject: [PATCH 64/200] [icecat]: housekeeping --- diff --git a/libre/icecat/9003-FSDG-urihandlers.patch b/libre/icecat/9003-FSDG-urihandlers.patch deleted file mode 100644 index 504d18b..0000000 --- a/libre/icecat/9003-FSDG-urihandlers.patch +++ /dev/null @@ -1,240 +0,0 @@ -diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm -index 04b9205..ff3aec5 100644 ---- a/uriloader/exthandler/HandlerList.jsm -+++ b/uriloader/exthandler/HandlerList.jsm -@@ -11,229 +11,25 @@ this.kHandlerListVersion = 1; - this.kHandlerList = { - default: { - schemes: { -- mailto: { -+ irc: { - handlers: [ - { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -+ name: "KiwiIRC", -+ uriTemplate: "https://web.libera.chat/?url=%s", - }, - ], - }, -- }, -- }, -- cs: { -- schemes: { -- mailto: { -+ ircs: { - handlers: [ - { -- name: "Seznam", -- uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -+ name: "KiwiIRC", -+ uriTemplate: "https://web.libera.chat/?url=%s", - }, - ], - }, -- }, -- }, -- csb: { -- schemes: { - mailto: { - handlers: [ - { -- name: "Poczta Interia.pl", -- uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s", -- }, -- { -- name: "OnetPoczta", -- uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s", -- }, -- ], -- }, -- }, -- }, -- "es-CL": { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- { -- name: "Outlook", -- uriTemplate: -- "https://outlook.live.com/default.aspx?rru=compose&to=%s", -- }, -- ], -- }, -- }, -- }, -- "ja-JP-mac": { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Yahoo!メール", -- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- ], -- }, -- }, -- }, -- ja: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Yahoo!メール", -- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- ], -- }, -- }, -- }, -- kk: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Яндекс.Почта", -- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", -- }, -- { -- name: "Mail.Ru", -- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- ], -- }, -- }, -- }, -- ltg: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- { -- name: "inbox.lv mail", -- uriTemplate: "https://mail.inbox.lv/compose?to=%s", -- }, -- ], -- }, -- }, -- }, -- lv: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- { -- name: "inbox.lv mail", -- uriTemplate: "https://mail.inbox.lv/compose?to=%s", -- }, -- ], -- }, -- }, -- }, -- pl: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Poczta Interia.pl", -- uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- ], -- }, -- }, -- }, -- ru: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Яндекс.Почту", -- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", -- }, -- { -- name: "Mail.Ru", -- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", -- }, -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- ], -- }, -- }, -- }, -- sah: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Яндекс.Почта", -- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", -- }, -- { -- name: "Mail.Ru", -- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", -- }, -- ], -- }, -- }, -- }, -- uk: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- { -- name: "Outlook", -- uriTemplate: -- "https://outlook.live.com/default.aspx?rru=compose&to=%s", -- }, -- ], -- }, -- }, -- }, -- uz: { -- schemes: { -- mailto: { -- handlers: [ -- { -- name: "Gmail", -- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", -- }, -- { -- name: "Mail.Ru", -- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", - }, - ], - }, diff --git a/libre/icecat/9004-FSDG-misc.patch b/libre/icecat/9004-FSDG-misc.patch deleted file mode 100644 index c45b97e..0000000 --- a/libre/icecat/9004-FSDG-misc.patch +++ /dev/null @@ -1,1095 +0,0 @@ -From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001 -From: grizzlyuser -Date: Sat, 12 Mar 2022 17:14:25 +0100 -Subject: [PATCH] FSDG: Replace upstream default bookmarks - ---- - browser/base/content/default-bookmarks.html | 50 +++++++++------------ - 1 file changed, 21 insertions(+), 29 deletions(-) - -diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html -index b2d18d3098..e2e643bcf2 100644 ---- a/browser/base/content/default-bookmarks.html -+++ b/browser/base/content/default-bookmarks.html -@@ -1,14 +1,14 @@ - #filter substitution - --#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E -- --#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAHY0lEQVR4Aa3VA5RrSdfG8f+uOidJp/umczm2ffFhbNvG9722bdv22LZt+3I81+04B1XvfpPmWHut3yk06smus1Z4L8uXDv6MHzpowA8eWFS8FaY9eU+cCvxaFfF8W/FWGDy8a6n7DM7/H96DR3ldu0MVb8a0J+9CI1qXJP11a+79GOdP1f11FW/EtCfvQpx8mziFxMHEEEV1KYkrKl6Pea1Nbnrs/7hz7q2KUQsqRcUE/eV1acb/pyFQ7b9N3fguzNTxVsXrMa/avFgPb6SnukY8W6EgXvszrszjivH08F0VLZFK0rbUgRt9H2aS+lORznUxnTMV45kJG6fNPZSGnEodTJwUFGbphqdSll/H/SxWjEc92kYxSoO0uzEcwo90g/9rlKpHpCmX491MxQgzuvjtE0UieyqxhYZA3UGp8CjUtSMR2YrkFdf+/szi9X88+zM3/uncSx/81/f+7/HzPsu8q09i8MUNcCUHUTImceAAL+RC+UW1nMzHuUvxSVGBCloTgMT+GuOLipaGyg/OpLuE/jVI58wHb/zsdxD5tBVbDMQwOPe/8UDqHYuuPJjCZnP5nw/+mfyUPhADRtkAaIfosum23klBxH8b+KzCfuczG8IPXi4C5yHQwvDoPYhCBSkz1n9y1+WLd8xFzVUxxmIRjBIBVHXFZF58aEtW3exxsp0V8Aac8gpBnGQBRNymkP4VXKPdgdj8H2JB/DgMVwreATFhdoCdj/wY8x7+GM8/djyJ81hlnCPTUWfHb/0QlyRUelalEPcCHswIQARJPd64ohh/KHBagPcQB7sggHgIVHcM0wUyWWUAoNaEuobI9bP1dj9lw1nnMvehj/LS0wdinYO4wM1f/h6z3v9n1t3pTnAWBj04ZQA7LFROwMsu7QCpgcjuCh4Asg5Wa0ImgNDqqHTOtDyIgPPKkZ/cZOstzmT+Nw4jcA5JBO9SHjzzWKZt8CRd03ohD/RZALCigIwHawBmKgKSVoAiAi2VDCzsgo0bYB04lSojEAaQDyETsmTZf3PPdZ+irvMgTTF4SAVX7+SRC/dj5/f/C6D9d5UQLBAIFBJILIhtB1g2a8uZq+1+LwiAV8CSTujPwqoRbJjCJMdAeRVue+j/WLh4T2I3jcCEhN4ShmDFYR2IAXC8OHdDaMYAYBxU82AFAgPShHoejAEgUEViy2h5UbS9LLBajf5oMr866wc0wlWQvEEyNQKbIcSSwZBNIfAO41NQ9ZXd0IgBAQdUDAQWpjQhcfi6gCgguDtTm3vIUBdhdwUA/Pggqmy49/n/pr/q8ZMq4DziEwI0QOtpiT1kXUqQRqC8ohaDy0BqoGzxOUE6q9DwMBiOvtzm5OLi3migAFEwpjnOCzmKhZXUkyr1uEwtLqky1aStNk4jqhFFDVZb6ykYMjBodQxw5RAKZUgSqAq+YmmWzFxF0P8L61Z8pHhf5/S+bfHQJm1OLcuzw4YPcWH3/qysTcebFHyESTOkhLjUokt8M8VFCVYDbLXhvdCfARfiG3lkykDr2qhbXJTRUZBAngMwootGI3tbrbcIsR3ugp3Yhbun89l9/ko+qCDVGpQruHKJqDakBmnq2KyXaDZKrDX1KWau+ij0ZqAvgwR1JFuFmihwPTkdDQN9co3C6IMnwujs0sppELcOV+NHVc2wzv2eb+74J6ZP6kGazeEgZZJqiaRWJo6qbDb5MU7c4ixYmYUhC7YJaQxVgYrgSxa3sgNftdww31+usFuvuykfWDzU/4HytL0llTVz+SbiAScTryKxFFc6dlnnQVZP+wEo2grT7ACb5V7g2BnXsVfxHsLEgfGQTYb/1kJqWpKV3VDLM1iXi/a8PDrtqmecl451DwLg8oG1DtnMmcsKq/bQ1V3BmBTsfzgIfHucwINxICivADt8eADkBLJGtcc0ydHsmU7QEXBFfzwTeFwRnLFtDoBD7nv5+vv61v2XXzHlfR7oKtQxLkFcCqkDK8qMHdIex4gSMxaoKZBtS8lQ18NtJsPSmv/Nyfc3nma4RjsA8Jnq1HU+WC9cY01z865pJQrdDcQkrW6IpGOfun3oxLnw6m/SEBIyVFbOIMhmiXJy35oL+vYDBhkuGxY3YaTuy9TLA+Jv2inu2j2ph9NrTUMmCyIGjwEnyiCtUaUWnGlLR1hIlM6rKwpUX5qBiTuI02Du94aqx8zJhEsVI4IPduUZV+7vDC0CDv9GdeolUjObL18ckutqMKkQkc2kiFHOITLCwyiUp1bNUhuYRFrrxPoMzdDM/XbUf/gZvvYsozX+Cl5d5vh690afrk3+0hR4XyoxqYmQICaTSwjClI6cA3EIvhWi0QiIm6rRgaQh1ikfsMK43/xv8YWfASuUe6sBAIzqPmNwjb1nJdnP5PDbOpPgJMXjWhDAC4JgvEWUaQkoib/o/NzQb37S1fP0+Dt/6wHGKqe6v1yZvuG+zc69p3m7d4dnW8TjAaEdwmFKEcztkfSG67KVG346aeV8YEglincRYLQClVcdKsery6lI1VVNJbyF+jdp8gPG4E08mAAAAABJRU5ErkJggg== -- --#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA== -- --#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC -- --#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII= -+#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC -+ -+#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC -+ -+#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC -+ -+#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC -+ -+#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC - -@@ -29,31 +29,23 @@ -

-

default-bookmarks-toolbarfolder

-
default-bookmarks-toolbarfolder-description
--#ifndef NIGHTLY_BUILD -

--

default-bookmarks-getting-started
-+
Parabola GNU/Linux-libre
-

--

default-bookmarks-firefox-heading

-+

Parabola GNU/Linux-libre

-

--

default-bookmarks-firefox-get-help
--
default-bookmarks-firefox-customize
--
default-bookmarks-firefox-community
--
default-bookmarks-firefox-about
--

--#else --

--

default-bookmarks-firefox-community
--

--

default-bookmarks-nightly-heading

-+
Parabola GNU/Linux-libre -+
Parabola GNU/Linux-libre Packages -+
Parabola GNU/Linux-libre Wiki -+
Parabola GNU/Linux-libre Labs -+

-+

Free Software Foundation

-

--

default-bookmarks-nightly-blog
--
default-bookmarks-bugzilla
--
default-bookmarks-mdn
--
default-bookmarks-nightly-tester-tools
--
default-bookmarks-crashes
--
default-bookmarks-planet
-+
Free Software Foundation -+
The GNU Operating System and the Free Software Movement -+
LibrePlanet -+
h-node -

--#endif - - - --- -2.35.1 - -From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001 -From: grizzlyuser -Date: Sat, 7 May 2022 21:46:48 +0200 -Subject: [PATCH] Remove 'More from Mozilla' section in Preferences - -Currently it contains functionality to provide links to nonfree software -like Firefox Mobile, which is not compatible with the FSDG for the same -reasons as desktop Firefox. ---- - browser/app/profile/firefox.js | 2 +- - .../static/browser_all_files_referenced.js | 12 ------- - browser/components/preferences/jar.mn | 4 --- - .../more-from-mozilla-qr-code-advanced.svg | 4 --- - .../more-from-mozilla-qr-code-simple-cn.svg | 4 --- - .../more-from-mozilla-qr-code-simple.svg | 4 --- - .../components/preferences/moreFromMozilla.js | 33 +------------------ - browser/components/preferences/preferences.js | 9 ----- - .../components/preferences/preferences.xhtml | 12 ------- - 9 files changed, 2 insertions(+), 82 deletions(-) - delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg - delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg - delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg - -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 76b495ea6c..d0c2b98b11 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true); - #else - pref("browser.preferences.experimental", false); - #endif --pref("browser.preferences.moreFromMozilla", true); -+pref("browser.preferences.moreFromMozilla", false); - pref("browser.preferences.experimental.hidden", false); - pref("browser.preferences.defaultPerformanceSettings.enabled", true); - -diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index 4c59b84a7c..44d36d3b28 100644 ---- a/browser/base/content/test/static/browser_all_files_referenced.js -+++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -33,7 +33,6 @@ var gExceptionPaths = [ - "chrome://browser/content/assets/moz-vpn.svg", - "chrome://browser/content/assets/vpn-logo.svg", - "chrome://browser/content/assets/focus-promo.png", -- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg", - "chrome://browser/content/assets/klar-qr-code.svg", - - // These app marketplace icons are referenced based on the user's locale -@@ -136,17 +135,6 @@ var whitelist = [ - // extensions/pref/autoconfig/src/nsReadConfig.cpp - { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, - -- // browser/components/preferences/moreFromMozilla.js -- // These files URLs are constructed programatically at run time. -- { -- file: -- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg", -- }, -- { -- file: -- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg", -- }, -- - { file: "resource://gre/greprefs.js" }, - - // layout/mathml/nsMathMLChar.cpp -diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index 912d9edf08..dd4697a368 100644 ---- a/browser/components/preferences/jar.mn -+++ b/browser/components/preferences/jar.mn -@@ -14,12 +14,8 @@ browser.jar: - content/browser/preferences/containers.js - content/browser/preferences/sync.js - content/browser/preferences/experimental.js -- content/browser/preferences/moreFromMozilla.js - content/browser/preferences/fxaPairDevice.xhtml - content/browser/preferences/fxaPairDevice.js - content/browser/preferences/findInPage.js -- content/browser/preferences/more-from-mozilla-qr-code-simple.svg -- content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg -- content/browser/preferences/more-from-mozilla-qr-code-advanced.svg - content/browser/preferences/web-appearance-dark.svg - content/browser/preferences/web-appearance-light.svg -diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg -deleted file mode 100644 -index 4848d3e20c..0000000000 ---- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg -+++ /dev/null -@@ -1,4 +0,0 @@ -- -- -\ No newline at end of file -diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg -deleted file mode 100644 -index 5052db9702..0000000000 ---- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg -+++ /dev/null -@@ -1,4 +0,0 @@ -- -- -diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg -deleted file mode 100644 -index 279595db10..0000000000 ---- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg -+++ /dev/null -@@ -1,4 +0,0 @@ -- -- -\ No newline at end of file -diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js -index 1208a5dbcd..ff91f7421e 100644 ---- a/browser/components/preferences/moreFromMozilla.js -+++ b/browser/components/preferences/moreFromMozilla.js -@@ -81,38 +81,7 @@ var gMoreFromMozillaPane = { - }, - - renderProducts() { -- let products = [ -- { -- id: "firefox-mobile", -- title_string_id: "more-from-moz-firefox-mobile-title", -- description_string_id: "more-from-moz-firefox-mobile-description", -- region: "global", -- button: { -- id: "fxMobile", -- type: "link", -- label_string_id: "more-from-moz-learn-more-link", -- actionURL: AppConstants.isChinaRepack() -- ? "https://www.firefox.com.cn/browsers/mobile/" -- : "https://www.mozilla.org/firefox/browsers/mobile/", -- }, -- qrcode: { -- title: { -- string_id: "more-from-moz-qr-code-box-firefox-mobile-title", -- }, -- image_src_prefix: -- "chrome://browser/content/preferences/more-from-mozilla-qr-code", -- button: { -- id: "qr-code-send-email", -- label: { -- string_id: "more-from-moz-qr-code-box-firefox-mobile-button", -- }, -- actionURL: AppConstants.isChinaRepack() -- ? "https://www.firefox.com.cn/mobile/get-app/" -- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", -- }, -- }, -- }, -- ]; -+ let products = []; - - if (BrowserUtils.shouldShowVPNPromo()) { - const vpn = { -diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js -index f6dc2b3781..34c7d8c528 100644 ---- a/browser/components/preferences/preferences.js -+++ b/browser/components/preferences/preferences.js -@@ -10,7 +10,6 @@ - /* import-globals-from privacy.js */ - /* import-globals-from sync.js */ - /* import-globals-from experimental.js */ --/* import-globals-from moreFromMozilla.js */ - /* import-globals-from findInPage.js */ - /* import-globals-from /browser/base/content/utilityOverlay.js */ - /* import-globals-from /toolkit/content/preferencesBindings.js */ -@@ -203,14 +202,6 @@ function init_all() { - register_module("paneExperimental", gExperimentalPane); - } - -- NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true }); -- if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) { -- document.getElementById("category-more-from-mozilla").hidden = false; -- gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable( -- "template" -- ); -- register_module("paneMoreFromMozilla", gMoreFromMozillaPane); -- } - // The Sync category needs to be the last of the "real" categories - // registered and inititalized since many tests wait for the - // "sync-pane-loaded" observer notification before starting the test. -diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml -index 81059f3d2e..be23729276 100644 ---- a/browser/components/preferences/preferences.xhtml -+++ b/browser/components/preferences/preferences.xhtml -@@ -33,7 +33,6 @@ - - - -- - - - -@@ -152,16 +151,6 @@ - - - -- - - - -@@ -214,7 +203,6 @@ - #include containers.inc.xhtml - #include sync.inc.xhtml - #include experimental.inc.xhtml --#include moreFromMozilla.inc.xhtml - - - --- -2.36.0 - - -From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001 -From: grizzlyuser -Date: Sat, 7 May 2022 21:51:06 +0200 -Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private - Browsing - -Please correct me if I'm wrong, but these are not compatible with FSDG -for the same reasons as the original Firefox. ---- - browser/app/profile/firefox.js | 2 +- - .../static/browser_all_files_referenced.js | 2 - - .../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------ - .../newtab/lib/PanelTestProvider.jsm | 84 ------- - .../content/assets/focus-qr-code.svg | 114 ---------- - .../content/assets/klar-qr-code.svg | 114 ---------- - 6 files changed, 1 insertion(+), 530 deletions(-) - delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg - delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg - -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index d0c2b98b11..54cc9de7e6 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g - pref("browser.promo.focus.disallowed_regions", "cn"); - - // Default to enabling focus promos to be shown where allowed. --pref("browser.promo.focus.enabled", true); -+pref("browser.promo.focus.enabled", false); - - // Comma separated string of mozilla vpn supported platforms. - pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux"); -diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js -index 44d36d3b28..6823855d56 100644 ---- a/browser/base/content/test/static/browser_all_files_referenced.js -+++ b/browser/base/content/test/static/browser_all_files_referenced.js -@@ -32,8 +32,6 @@ var gExceptionPaths = [ - "chrome://activity-stream/content/data/content/assets/remote/", - "chrome://browser/content/assets/moz-vpn.svg", - "chrome://browser/content/assets/vpn-logo.svg", -- "chrome://browser/content/assets/focus-promo.png", -- "chrome://browser/content/assets/klar-qr-code.svg", - - // These app marketplace icons are referenced based on the user's locale - // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx -diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm -index 940332f27f..1f7378bbae 100644 ---- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm -+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm -@@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [ - ], - }, - }, -- { -- id: "PB_NEWTAB_FOCUS_PROMO", -- type: "default", -- template: "pb_newtab", -- groups: ["pbNewtab"], -- content: { -- infoBody: "fluent:about-private-browsing-info-description-simplified", -- infoEnabled: true, -- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", -- infoLinkText: "fluent:about-private-browsing-learn-more-link", -- infoTitle: "", -- infoTitleEnabled: false, -- promoEnabled: true, -- promoType: "FOCUS", -- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", -- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", -- promoLinkText: "fluent:about-private-browsing-focus-promo-cta", -- promoLinkType: "button", -- promoSectionStyle: "below-search", -- promoTitle: "fluent:about-private-browsing-focus-promo-text-c", -- promoTitleEnabled: true, -- promoButton: { -- action: { -- type: "SHOW_SPOTLIGHT", -- data: { -- content: { -- id: "FOCUS_PROMO", -- template: "multistage", -- modal: "tab", -- backdrop: "transparent", -- screens: [ -- { -- id: "DEFAULT_MODAL_UI", -- content: { -- logo: { -- imageURL: -- "chrome://browser/content/assets/focus-logo.svg", -- height: "48px", -- }, -- title: { -- string_id: "spotlight-focus-promo-title", -- }, -- subtitle: { -- string_id: "spotlight-focus-promo-subtitle", -- }, -- dismiss_button: { -- action: { -- navigate: true, -- }, -- }, -- ios: { -- action: { -- data: { -- args: -- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- android: { -- action: { -- data: { -- args: -- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- tiles: { -- type: "mobile_downloads", -- data: { -- QR_code: { -- image_url: -- "chrome://browser/content/assets/focus-qr-code.svg", -- alt_text: { -- string_id: "spotlight-focus-promo-qr-code", -- }, -- image_overrides: { -- de: -- "chrome://browser/content/assets/klar-qr-code.svg", -- }, -- }, -- marketplace_buttons: ["ios", "android"], -- }, -- }, -- }, -- }, -- ], -- }, -- }, -- }, -- }, -- }, -- priority: 2, -- frequency: { -- custom: [ -- { -- cap: 3, -- period: 604800000, // Max 3 per week -- }, -- ], -- lifetime: 12, -- }, -- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", -- }, -- { -- id: "PB_NEWTAB_KLAR_PROMO", -- type: "default", -- template: "pb_newtab", -- groups: ["pbNewtab"], -- content: { -- infoBody: "fluent:about-private-browsing-info-description-simplified", -- infoEnabled: true, -- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", -- infoLinkText: "fluent:about-private-browsing-learn-more-link", -- infoTitle: "", -- infoTitleEnabled: false, -- promoEnabled: true, -- promoType: "FOCUS", -- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", -- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", -- promoLinkText: "Download Firefox Klar", -- promoLinkType: "button", -- promoSectionStyle: "below-search", -- promoTitle: -- "Firefox Klar clears your history every time while blocking ads and trackers.", -- promoTitleEnabled: true, -- promoButton: { -- action: { -- type: "SHOW_SPOTLIGHT", -- data: { -- content: { -- id: "KLAR_PROMO", -- template: "multistage", -- modal: "tab", -- backdrop: "transparent", -- screens: [ -- { -- id: "DEFAULT_MODAL_UI", -- order: 0, -- content: { -- logo: { -- imageURL: -- "chrome://browser/content/assets/focus-logo.svg", -- height: "48px", -- }, -- title: "Get Firefox Klar", -- subtitle: { -- string_id: "spotlight-focus-promo-subtitle", -- }, -- dismiss_button: { -- action: { -- navigate: true, -- }, -- }, -- ios: { -- action: { -- data: { -- args: -- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- android: { -- action: { -- data: { -- args: -- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- tiles: { -- type: "mobile_downloads", -- data: { -- QR_code: { -- image_url: -- "chrome://browser/content/assets/klar-qr-code.svg", -- alt_text: { -- string_id: "spotlight-focus-promo-qr-code", -- }, -- }, -- marketplace_buttons: ["ios", "android"], -- }, -- }, -- }, -- }, -- ], -- }, -- }, -- }, -- }, -- }, -- priority: 2, -- frequency: { -- custom: [ -- { -- cap: 3, -- period: 604800000, // Max 3 per week -- }, -- ], -- lifetime: 12, -- }, -- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", -- }, - { - id: "PB_NEWTAB_INFO_SECTION", - template: "pb_newtab", - -diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm -index a991581f7b..af57c3eea8 100644 ---- a/browser/components/newtab/lib/PanelTestProvider.jsm -+++ b/browser/components/newtab/lib/PanelTestProvider.jsm -@@ -558,90 +558,6 @@ const MESSAGES = () => [ - frequency: { lifetime: 3 }, - trigger: { id: "defaultBrowserCheck" }, - }, -- { -- id: "PB_FOCUS_PROMO", -- groups: ["panel-test-provider"], -- template: "spotlight", -- content: { -- template: "multistage", -- backdrop: "transparent", -- screens: [ -- { -- id: "PBM_FIREFOX_FOCUS", -- order: 0, -- content: { -- logo: { -- imageURL: "chrome://browser/content/assets/focus-logo.svg", -- height: "48px", -- }, -- title: { -- string_id: "spotlight-focus-promo-title", -- }, -- subtitle: { -- string_id: "spotlight-focus-promo-subtitle", -- }, -- dismiss_button: { -- action: { -- navigate: true, -- }, -- }, -- ios: { -- action: { -- data: { -- args: -- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- android: { -- action: { -- data: { -- args: -- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- email_link: { -- action: { -- data: { -- args: "https://mozilla.org", -- where: "tabshifted", -- }, -- type: "OPEN_URL", -- navigate: true, -- }, -- }, -- tiles: { -- type: "mobile_downloads", -- data: { -- QR_code: { -- image_url: -- "chrome://browser/content/assets/focus-qr-code.svg", -- alt_text: { -- string_id: "spotlight-focus-promo-qr-code", -- }, -- image_overrides: { -- de: "chrome://browser/content/assets/klar-qr-code.svg", -- }, -- }, -- email: { -- link_text: "Email yourself a link", -- }, -- marketplace_buttons: ["ios", "android"], -- }, -- }, -- }, -- }, -- ], -- }, -- trigger: { id: "defaultBrowserCheck" }, -- }, - { - id: "PB_NEWTAB_VPN_PROMO", - template: "pb_newtab", -diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg -deleted file mode 100644 -index f182567314..0000000000 ---- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg -+++ /dev/null -@@ -1,114 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg -deleted file mode 100644 -index 2217ca055c..0000000000 ---- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg -+++ /dev/null -@@ -1,114 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --- -2.36.0 - -diff --git a/browser/app/permissions b/browser/app/permissions -index 991284081d..888cc811ce 100644 ---- a/browser/app/permissions -+++ b/browser/app/permissions -@@ -15,11 +15,5 @@ origin uitour 1 https://support.mozilla.org - origin uitour 1 about:home - origin uitour 1 about:newtab - --# XPInstall --origin install 1 https://addons.mozilla.org -- - # Remote troubleshooting - origin remote-troubleshooting 1 https://support.mozilla.org -- --# addon install --origin install 1 https://fpn.firefox.com -diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml -index 7d37d26..4ebbc06 100644 ---- a/browser/components/preferences/sync.inc.xhtml -+++ b/browser/components/preferences/sync.inc.xhtml -@@ -35,22 +35,6 @@ - - - -- - - - -diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -index dabfadc..3ce732e 100644 ---- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl -+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. - - policy-ExtensionUpdate = Enable or disable automatic extension updates. - --policy-FirefoxHome = Configure Firefox Home. -+policy-FirefoxHome = Configure Iceweasel Home. - - policy-FlashPlugin = Allow or deny usage of the Flash plugin. - -diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl -index 1b29e8d..6f7566c 100644 ---- a/browser/locales/en-US/browser/preferences/preferences.ftl -+++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -550,7 +550,7 @@ home-restore-defaults = - # "Firefox" should be treated as a brand and kept in English, - # while "Home" and "(Default)" can be localized. - home-mode-choice-default = -- .label = Firefox Home (Default) -+ .label = Iceweasel Home (Default) - - home-mode-choice-custom = - .label = Custom URLs… -@@ -577,10 +577,10 @@ choose-bookmark = - .label = Use Bookmark… - .accesskey = B - --## Home Section - Firefox Home Content Customization -+## Home Section - Iceweasel Home Content Customization - --home-prefs-content-header = Firefox Home Content --home-prefs-content-description = Choose what content you want on your Firefox Home screen. -+home-prefs-content-header = Iceweasel Home Content -+home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. - - home-prefs-search-header = - .label = Web Search -@@ -714,16 +714,6 @@ sync-signedout-account-signin2 = - .label = Sign in to { -sync-brand-short-name }… - .accesskey = i - --# This message contains two links and two icon images. --# `` - Android logo icon --# `` - Link to Android Download --# `` - iOS logo icon --# `` - Link to iOS Download --# --# They can be moved within the sentence as needed to adapt --# to your language, but should not be changed or translated. --sync-mobile-promo = Download Firefox for Android or iOS to sync with your mobile device. -- - ## Firefox Account - Signed in - - sync-profile-picture = -diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -index edd871b..77870fe 100644 ---- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -+++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl -@@ -7,7 +7,7 @@ addons-window = - addons-page-title = Add-ons Manager - - search-header = -- .placeholder = Search addons.mozilla.org -+ .placeholder = Search www.parabola.nu/packages - .searchbuttonlabel = Search - - search-header-shortcut = -@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes - - default-heading-search-label = Find more add-ons - addons-heading-search-input = -- .placeholder = Search addons.mozilla.org -+ .placeholder = Search www.parabola.nu/packages - - addon-page-options-button = - .title = Tools for all add-ons -diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl -index 5ac8a7b08c..fec81698e3 100644 ---- a/browser/components/protections/content/protections.ftl -+++ b/browser/components/protections/content/protections.ftl -@@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name } - - vpn-title-subscribed = VPN: Subscribed - # Note This text is not being translated, and the
will need to be removed if or when it does get translated --vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from
the Google Play Store or Apple App Store. -+vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. - - vpn-banner-header = Protection that extends beyond the browser - # Note This text is not being translated, and the
will need to be removed if or when it does get translated -diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html -index e33c814f62..5698f2b3e9 100644 ---- a/browser/components/protections/content/protections.html -+++ b/browser/components/protections/content/protections.html -@@ -303,8 +303,6 @@ - -

-

-- -- -

- - -diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js -index 2417f1a641..698c48ccc3 100644 ---- a/browser/components/protections/content/vpn-card.js -+++ b/browser/components/protections/content/vpn-card.js -@@ -23,22 +23,6 @@ export default class VPNCard { - vpnLink.addEventListener("click", () => { - this.doc.sendTelemetryEvent("click", "vpn_card_link"); - }); -- let androidVPNAppLink = document.getElementById( -- "vpn-google-playstore-link" -- ); -- androidVPNAppLink.href = RPMGetStringPref( -- "browser.contentblocking.report.vpn-android.url" -- ); -- androidVPNAppLink.addEventListener("click", () => { -- document.sendTelemetryEvent("click", "vpn_app_link_android"); -- }); -- let iosVPNAppLink = document.getElementById("vpn-app-store-link"); -- iosVPNAppLink.href = RPMGetStringPref( -- "browser.contentblocking.report.vpn-ios.url" -- ); -- iosVPNAppLink.addEventListener("click", () => { -- document.sendTelemetryEvent("click", "vpn_app_link_ios"); -- }); - - const vpnBanner = this.doc.querySelector(".vpn-banner"); - const exitIcon = vpnBanner.querySelector(".exit-icon"); From 86d2ae2190c1818ea2d990940715163240232cdb Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 25 2022 20:05:36 +0000 Subject: [PATCH 65/200] [icecat]: tweak for 1686 --- diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e2d1016..c7fcdbf 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -37,7 +37,7 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python-setuptools python-psutil python-zstandard lld dump_syms) makedepends+=(jq python-jsonschema) -makedepends_i686=(gcc10) +#makedepends_i686=(gcc10) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -51,8 +51,9 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta ) source_armv7h=(arm.patch build-arm-libopus.patch) -source_i686=(avoid-libxul-OOM-python-check.patch - rust-static-disable-network-test-on-static-libraries.patch) +source_i686=('avoid-libxul-OOM-python-check.patch' + 'rust-static-disable-network-test-on-static-libraries.patch' + 'firefox-99.0.1-fdlibm-double.patch') sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' 'SKIP' 'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d' @@ -62,7 +63,8 @@ sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' - '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041') + '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' + '62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d') validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds) @@ -199,11 +201,11 @@ ac_add_options --disable-linker=lld ac_add_options --enable-linker=bfd ac_add_options --disable-lto ac_add_options --disable-rust-simd -export CC=gcc-10 -export CXX=g++-10 -export AR=gcc-ar-10 -export NM=gcc-nm-10 -export RANLIB=gcc-ranlib-10 +export CC=gcc +export CXX=g++ +export AR=gcc-ar +export NM=gcc-nm +export RANLIB=gcc-ranlib export STRIP=strip END @@ -215,6 +217,14 @@ END # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757 echo "applying rust-static-disable-network-test-on-static-libraries.patch" patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch + + # FIXME: this patch is probably temporary - it comes from mozilla + # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + # /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21: + # error: conflicting declaration ‘typedef __double_t double_t’ + # /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’ + echo "applying firefox-99.0.1-fdlibm-double.patch" + patch -p1 -i "$srcdir/firefox-99.0.1-fdlibm-double.patch" ;; x86_64) ;; From 68c6d6e664217aad892e0f754b9007290afceaeb Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 25 2022 20:05:47 +0000 Subject: [PATCH 66/200] [icecat]: tweak for armv7h --- diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index c7fcdbf..cc4eac0 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -49,8 +49,7 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta icecat.desktop icecat-safe.desktop 0001-Use-remoting-name-for-GDK-application-names.patch ) -source_armv7h=(arm.patch - build-arm-libopus.patch) +source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') @@ -60,8 +59,7 @@ sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208' 'a7f5ae9f018678a391739365329a5a5b527b536bc9aac441c73ae811d2fa530d' ) -sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966' - '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') +sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' '62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d') @@ -187,8 +185,6 @@ END # EME is disabled anyway in the built package, but better check if it exists for ARM each new release. sed -i 's|ac_add_options --disable-eme||' ../mozconfig - echo "applying arm.patch" - patch -p1 -i ../arm.patch echo "applying build-arm-libopus.patch" patch -p1 -i ../build-arm-libopus.patch ;; From 49e30c7f54a9de3da54e4e588f2336abf32a3ddb Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 25 2022 20:05:49 +0000 Subject: [PATCH 67/200] [retroarch]: upgrade to v1.10.3 --- diff --git a/libre/retroarch/PKGBUILD b/libre/retroarch/PKGBUILD index 954cc32..a3e6bf8 100644 --- a/libre/retroarch/PKGBUILD +++ b/libre/retroarch/PKGBUILD @@ -12,42 +12,40 @@ pkgname=retroarch -pkgver=1.9.6 +pkgver=1.10.3 pkgrel=2 -pkgrel+=.parabola2 +pkgrel+=.parabola1 pkgdesc='Reference frontend for the libretro API' arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) url=http://www.libretro.com/ license=(GPL) groups=(libretro) depends=( alsa-lib + ffmpeg flac libass.so - libavcodec.so - libavformat.so - libavutil.so libdrm libfreetype.so libgl libpulse - libswresample.so - libswscale.so libudev.so libusb-1.0.so mbedtls mesa - miniupnpc openal qt5-base sdl2 + spirv-tools v4l-utils zlib ) depends+=(libmbedcrypto.so) makedepends=( + gamemode git + libdecor libx11 libxcb libxext @@ -61,6 +59,8 @@ makedepends=( wayland-protocols ) optdepends=( + 'gamemode: GameMode support' + 'libdecor: Wayland decorations' 'libretro-overlays: Collection of overlays' 'libretro-shaders: Collection of shaders' 'libxinerama: X11 support' @@ -71,45 +71,36 @@ optdepends=( 'wayland: Wayland support' ) backup=(etc/retroarch.cfg) -_tag=4a6dc36b1cc026bf337537e2d7527a117727bb91 +_commit=9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 # tag v1.10.3 source=( - git+https://github.com/libretro/RetroArch.git#tag=${_tag} + git+https://github.com/libretro/RetroArch.git#commit=${_commit} retroarch-config.patch disable-auto-update.patch ) -sha256sums=( - SKIP - 7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e - cb3915a5ada76e29abd2a8b2c06c8dc50909473b5c53ec112dffab87fcc585e1 -) +b2sums=('SKIP' + '5ecbe57126c7f9b66bdf189f0af2f1cec031cb68ea85bb9609847ba9beb0e720c902cd3330d7c286901a73e6c2e272c3f04166cf9a47bb6f80097f19dde8ce3a' + '40fb95bd303cd59731d2dfd68da40032affa4bdcd07c7a5831109141e2768e18571231589375c8d97397eefebe5bf1c086dc255be8179906226c6e6c995a4f84') pkgver() { cd RetroArch - git describe --tags | sed 's/^v//' } prepare() { cd RetroArch - patch -Np1 -i ../retroarch-config.patch - git cherry-pick -n 685948368e6b28b97e1b91bdfe5921519359a033 # FS#66843 echo "applying disable-auto-update.patch" - sed -i 's|\(#define DEFAULT_BUILDBOT_SERVER_URL\) ".*|\1 ""|' config.def.h - sed -i 's|\(#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL\) ".*|\1 ""|' config.def.h patch -Np1 -i ${srcdir}/disable-auto-update.patch } build() { cd RetroArch - ./configure \ --prefix=/usr \ --disable-builtinflac \ --disable-builtinmbedtls \ - --disable-builtinminiupnpc \ --disable-builtinzlib \ --disable-cg \ --disable-jack \ @@ -123,9 +114,7 @@ build() { package() { cd RetroArch - make DESTDIR="${pkgdir}" install - install -Dm 644 libretro-common/audio/dsp_filters/*.{dsp,so} -t "${pkgdir}"/usr/lib/retroarch/filters/audio/ install -Dm 644 gfx/video_filters/*.{filt,so} -t "${pkgdir}"/usr/lib/retroarch/filters/video/ } diff --git a/libre/retroarch/disable-auto-update.patch b/libre/retroarch/disable-auto-update.patch index 82938fa..b8832d2 100644 --- a/libre/retroarch/disable-auto-update.patch +++ b/libre/retroarch/disable-auto-update.patch @@ -1,8 +1,150 @@ +diff --git a/config.def.h b/config.def.h +index 49a2eacb94..5c502741cb 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -672,7 +672,7 @@ static const bool menu_show_shutdown = true; + #if defined(HAVE_LAKKA) || defined(VITA) + static const bool menu_show_core_updater = false; + #else +-static const bool menu_show_core_updater = true; ++static const bool menu_show_core_updater = false; + #endif + #ifdef HAVE_MIST + static const bool menu_show_core_manager_steam = true; +@@ -1561,96 +1561,96 @@ static const bool enable_device_vibration = false; + #endif + + #if defined(HAKCHI) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID) + #if defined(ANDROID_ARM_V7) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_ARM) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_AARCH64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_X86) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(ANDROID_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif defined(__QNX__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(IOS) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/ios/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(OSX) + #if defined(__x86_64__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__aarch64__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif defined(_WIN32) && !defined(_XBOX) + #if _MSC_VER >= 1910 + #ifndef __WINRT__ + #if defined(__x86_64__) || defined(_M_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__arm__) || defined(_M_ARM) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__aarch64__) || defined(_M_ARM64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #else + #if defined(__x86_64__) || defined(_M_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__arm__) || defined(_M_ARM) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__aarch64__) || defined(_M_ARM64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #endif + #elif _MSC_VER == 1600 + #if defined(__x86_64__) || defined(_M_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif _MSC_VER == 1400 +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif _MSC_VER == 1310 +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else + #if defined(__x86_64__) || defined(_M_X64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #endif + #elif defined(__linux__) + #if defined(__x86_64__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86_64/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__i386__) || defined(__i486__) || defined(__i686__) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + #elif defined(WIIU) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(HAVE_LIBNX) +-#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/" ++#define DEFAULT_BUILDBOT_SERVER_URL "" + #elif defined(_3DS) + #define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/" + #else + #define DEFAULT_BUILDBOT_SERVER_URL "" + #endif + +-#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/" ++#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "" + + #define DEFAULT_DISCORD_APP_ID "475456035851599874" + diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m -index a5b01fb67e..6a66752926 100644 +index 6c5fdca400..6b0dcb3947 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m -@@ -475,7 +475,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[], +@@ -460,7 +460,7 @@ static void frontend_darwin_get_env(int *argc, char *argv[], int major, minor; get_ios_version(&major, &minor); if (major > 8) @@ -24,11 +166,37 @@ index 48e0354aa6..6dc8fc9702 100644 while (!net_http_update(http1, &pos, &tot)) printf("%.9lu / %.9lu \r",pos,tot); +diff --git a/qb/config.params.sh b/qb/config.params.sh +index f457ae4263..e5c4e03c25 100644 +--- a/qb/config.params.sh ++++ b/qb/config.params.sh +@@ -139,9 +139,9 @@ HAVE_7ZIP=yes # Compile in 7z support + HAVE_FLAC=auto # Compile in flac support + HAVE_DR_MP3=yes # Compile in Dr. MP3 support + HAVE_BUILTINFLAC=auto # Bake in flac support +-HAVE_ONLINE_UPDATER=yes # Disable the online updater +-HAVE_UPDATE_CORES=yes # Disable downloading cores with online updater +-HAVE_UPDATE_ASSETS=yes # Disable downloading assets with online updater ++HAVE_ONLINE_UPDATER=no # Disable the online updater ++HAVE_UPDATE_CORES=no # Disable downloading cores with online updater ++HAVE_UPDATE_ASSETS=no # Disable downloading assets with online updater + HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support + HAVE_PARPORT=auto # Parallel port joypad support + HAVE_IMAGEVIEWER=yes # Built-in image viewer support. diff --git a/retroarch.cfg b/retroarch.cfg -index 21d91ab1ef..fa99900f4d 100644 +index 416c6c1abb..d574d637f6 100644 --- a/retroarch.cfg +++ b/retroarch.cfg -@@ -729,13 +729,13 @@ menu_show_core_updater = false +@@ -687,7 +687,7 @@ + #### Menu + + # If disabled, will hide 'Online Updater' inside the menu. +-# menu_show_online_updater = true ++menu_show_online_updater = false + + # If disabled, will hide the ability to update cores (and core info files) inside the menu. + menu_show_core_updater = false +@@ -769,13 +769,13 @@ menu_show_core_updater = false #### Core Updater # URL to core update directory on buildbot. From cc607dfabca1b6eb81bfd9bcc58fb05dbdb0caa6 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Aug 25 2022 20:06:00 +0000 Subject: [PATCH 68/200] [xscreensaver]: upgrade to v6.04 --- diff --git a/libre/xscreensaver/PKGBUILD b/libre/xscreensaver/PKGBUILD index e091c9b..4aa8311 100644 --- a/libre/xscreensaver/PKGBUILD +++ b/libre/xscreensaver/PKGBUILD @@ -1,21 +1,24 @@ -# Maintainer (Arch): Levente Polyak -# Contributor (Arch): Eric Bélanger +# Maintainer (arch): Levente Polyak +# Contributor: Eric Bélanger # Maintainer: Omar Vega Ramos # Contributor: André Silva # Contributor: freemor + # parabola changes and rationale: -# removed nonfree asm files +# - remove non-free asm files +# - remove references to non-free software +# - remove nag warnings + pkgname=xscreensaver -pkgver=6.00 -pkgrel=2 +pkgver=6.04 +pkgrel=1 pkgrel+=.parabola1 pkgdesc='Screen saver and locker for the X Window System' -pkgdesc+=", without nonfree asm files" url='https://www.jwz.org/xscreensaver/' arch=('x86_64') -arch+=('i686' 'armv7h') +arch+=(armv7h i686) license=('BSD') depends=( 'gtk2' 'glu' 'xorg-appres' 'libglvnd' 'libjpeg-turbo' 'libjpeg.so' @@ -27,22 +30,33 @@ makedepends=('bc' 'intltool' 'libxpm' 'gdm' 'systemd' 'systemd-libs') optdepends=('gdm: for login manager support') backup=('etc/pam.d/xscreensaver') source=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz - LICENSE - Remove_bsod.patch) -sha512sums=('7292bacf633137b5c0eb2de9a99dc238b2012a113e62c86d4be19fc2fd4fea7133bd950253ca2d3a4ab27af4b4dc9a40a857e8d3dc714946ccfa7efcd043ded6' - '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e' - '1b63c91ae8ef74b9fe34ddf098620299fcf791140468240eeebbdc00a1d34f176d3a67ba90b942bfece0c76c2239eea02d86b5405e5397c7cff6e021c5bf72e3') -b2sums=('228f176915f0f62bc782d43b19c767bd58f72820665ed1c0602fc5f7de4b58898de2c087905fab6bca886452a996985c361e844854dfb864066699db9c4e7235' - 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9' - '1152d9141f994bb1494a4583460529ff607d3cb1ab5b53e8f2fa65d1bf9c9552c4d8e246dc5ce28c6e63735b46234baad6768d89c85c159f0ff089da66cc319a') + LICENSE) +source+=(remove_bsod.patch + remove-nagging.patch) +sha512sums=('7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071' + '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e') +sha512sums+=('1b63c91ae8ef74b9fe34ddf098620299fcf791140468240eeebbdc00a1d34f176d3a67ba90b942bfece0c76c2239eea02d86b5405e5397c7cff6e021c5bf72e3' + 'da0d2dc10fda9e95950269367ff8b275c8262036e2d1302918c313a0bff79c35cacbb818c8f7b77b7b1f9d05aec91ecfaa78049d4dabb7c400aabeeb9af55b68') +b2sums=('42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b' + 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9') +b2sums+=('1152d9141f994bb1494a4583460529ff607d3cb1ab5b53e8f2fa65d1bf9c9552c4d8e246dc5ce28c6e63735b46234baad6768d89c85c159f0ff089da66cc319a' + '607040a87be8b1dbefb3fa4897de33f2f712946a68bf4e5af90888b1783bca40bfd2cf5365ec75bfc61e71c09abcb95b59406501e7659cebf12cdae29592e326') + prepare() { cd ${pkgname}-${pkgver} + # Deleting dmsc.asm file due which don't have source code supplied rm -v hacks/images/m6502/dmsc.asm + # Remove BSOD for references to non-free (Issue #2391) - patch -Nup1 hacks/Makefile.in ../Remove_bsod.patch + echo "applying remove_bsod.patch" + patch -Nup1 hacks/Makefile.in ../remove_bsod.patch rm -v hacks/bsod* + + # remove annoying "this program is too old" messages + echo "applying remove-nagging.patch" + patch -Nup1 -i ../remove-nagging.patch } build() { @@ -52,9 +66,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ - --with-x-app-defaults=/usr/share/X11/app-defaults \ --without-setuid-hacks \ - --without-setcap-hacks \ --with-pam \ --with-login-manager \ --with-gtk \ diff --git a/libre/xscreensaver/Remove_bsod.patch b/libre/xscreensaver/Remove_bsod.patch deleted file mode 100644 index 55a228d..0000000 --- a/libre/xscreensaver/Remove_bsod.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/hacks/Makefile.in b/hacks/Makefile.in -index ef6ee5c..6f4ee46 100644 ---- a/hacks/Makefile.in -+++ b/hacks/Makefile.in -@@ -104,7 +104,7 @@ SRCS = xscreensaver-getimage.c \ - rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \ - rotor.c ant.c xjack.c xlyap.c \ - cynosure.c moire2.c flow.c epicycle.c interference.c \ -- truchet.c bsod.c crystal.c discrete.c distort.c kumppa.c \ -+ truchet.c crystal.c discrete.c distort.c kumppa.c \ - demon.c loop.c t3d.c penetrate.c deluxe.c compass.c \ - squiral.c xflame.c wander.c spotlight.c critical.c \ - phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \ -@@ -142,7 +142,7 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ - rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \ - rotor.o ant.o xjack.o xlyap.o xscreensaver-getimage.o \ - cynosure.o moire2.o flow.o epicycle.o interference.o \ -- truchet.o bsod.o crystal.o discrete.o distort.o kumppa.o \ -+ truchet.o crystal.o discrete.o distort.o kumppa.o \ - demon.o loop.o t3d.o penetrate.o deluxe.o compass.o \ - squiral.o xflame.o wander.o spotlight.o critical.o \ - phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \ -@@ -171,7 +171,7 @@ EXES = attraction blitspin bouboule braid decayscreen deco \ - slip strange swirl goop starfish munch \ - fadeplot rd-bomb coral mountain triangle \ - xjack xlyap cynosure moire2 flow epicycle \ -- interference truchet bsod crystal discrete distort kumppa \ -+ interference truchet crystal discrete distort kumppa \ - demon loop penetrate deluxe compass squiral xflame \ - wander spotlight phosphor xmatrix petri shadebobs \ - ccurve blaster bumps ripples xspirograph \ -@@ -210,7 +210,7 @@ HDRS = screenhack.h screenhackI.h fps.h fpsI.h xlockmore.h \ - apple2.h analogtv.h pacman.h pacman_ai.h pacman_level.h \ - asm6502.h delaunay.h recanim.h - MEN = anemone.man apollonian.man attraction.man \ -- blaster.man blitspin.man bouboule.man braid.man bsod.man \ -+ blaster.man blitspin.man bouboule.man braid.man \ - bumps.man ccurve.man compass.man coral.man \ - crystal.man cynosure.man decayscreen.man \ - deco.man deluxe.man demon.man discrete.man distort.man \ -@@ -661,9 +661,6 @@ interference: interference.o $(HACK_OBJS) $(COL) $(SHM) $(THRO) $(DBE) - truchet: truchet.o $(HACK_OBJS) $(COL) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) - --bsod: bsod.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG) -- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG) $(PNG_LIBS) $(THRL) -- - apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) - $(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) $(PNG_LIBS) $(TEXT_LIBS) $(THRL) - -@@ -1294,41 +1291,6 @@ braid.o: $(UTILS_SRC)/xft.h - braid.o: $(UTILS_SRC)/yarandom.h - braid.o: $(srcdir)/xlockmoreI.h - braid.o: $(srcdir)/xlockmore.h --bsod.o: $(srcdir)/analogtv.h --bsod.o: $(srcdir)/apple2.h --bsod.o: ../config.h --bsod.o: $(srcdir)/fps.h --bsod.o: images/gen/amiga_png.h --bsod.o: images/gen/android_png.h --bsod.o: images/gen/apple_png.h --bsod.o: images/gen/atari_png.h --bsod.o: images/gen/atm_png.h --bsod.o: images/gen/dvd_png.h --bsod.o: images/gen/gnome1_png.h --bsod.o: images/gen/gnome2_png.h --bsod.o: images/gen/hmac_png.h --bsod.o: images/gen/macbomb_png.h --bsod.o: images/gen/mac_png.h --bsod.o: images/gen/osx_10_2_png.h --bsod.o: images/gen/osx_10_3_png.h --bsod.o: images/gen/ransomware_png.h --bsod.o: images/gen/sun_png.h --bsod.o: $(srcdir)/recanim.h --bsod.o: $(srcdir)/screenhackI.h --bsod.o: $(srcdir)/screenhack.h --bsod.o: $(UTILS_SRC)/aligned_malloc.h --bsod.o: $(UTILS_SRC)/colors.h --bsod.o: $(UTILS_SRC)/font-retry.h --bsod.o: $(UTILS_SRC)/grabscreen.h --bsod.o: $(UTILS_SRC)/hsv.h --bsod.o: $(UTILS_SRC)/resources.h --bsod.o: $(UTILS_SRC)/thread_util.h --bsod.o: $(UTILS_SRC)/usleep.h --bsod.o: $(UTILS_SRC)/visual.h --bsod.o: $(UTILS_SRC)/xft.h --bsod.o: $(UTILS_SRC)/xshm.h --bsod.o: $(UTILS_SRC)/yarandom.h --bsod.o: $(srcdir)/ximage-loader.h - bubbles-default.o: $(srcdir)/bubbles.h - bubbles-default.o: ../config.h - bubbles-default.o: images/gen/blood10_png.h diff --git a/libre/xscreensaver/remove-nagging.patch b/libre/xscreensaver/remove-nagging.patch new file mode 100644 index 0000000..8cdbea6 --- /dev/null +++ b/libre/xscreensaver/remove-nagging.patch @@ -0,0 +1,40 @@ +diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c +index 0406d31..002c010 100644 +--- a/driver/demo-Gtk.c ++++ b/driver/demo-Gtk.c +@@ -5012,6 +5012,7 @@ main (int argc, char **argv) + gtk_timeout_add (5 * 1000, the_network_is_not_the_computer, s); + + ++#ifdef I_LOVE_NAG_SCREENS + if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17) + warning_dialog (s->toplevel_widget, + _("Warning:\n\n" +@@ -5024,6 +5025,7 @@ main (int argc, char **argv) + "your distro is doing you a disservice. Build from source.)\n" + ), + D_NONE, 7); ++#endif // I_LOVE_NAG_SCREENS + + /* Run the Gtk event loop, and not the Xt event loop. This means that + if there were Xt timers or fds registered, they would never get serviced, +diff --git a/driver/dialog.c b/driver/dialog.c +index 1ab6ee4..027a1ed 100644 +--- a/driver/dialog.c ++++ b/driver/dialog.c +@@ -1372,6 +1372,7 @@ window_draw (window_state *ws) + lines[i].align = CENTER; + i++; + ++#ifdef I_LOVE_NAG_SCREENS + if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17) + { + lines[i].text = _("Update available!\nThis version is very old.\n"); +@@ -1395,6 +1396,7 @@ window_draw (window_state *ws) + lines[i].align = CENTER; + i++; + } ++#endif // I_LOVE_NAG_SCREENS + + if (ws->hostname_label && *ws->hostname_label) + { diff --git a/libre/xscreensaver/remove_bsod.patch b/libre/xscreensaver/remove_bsod.patch new file mode 100644 index 0000000..55a228d --- /dev/null +++ b/libre/xscreensaver/remove_bsod.patch @@ -0,0 +1,92 @@ +diff --git a/hacks/Makefile.in b/hacks/Makefile.in +index ef6ee5c..6f4ee46 100644 +--- a/hacks/Makefile.in ++++ b/hacks/Makefile.in +@@ -104,7 +104,7 @@ SRCS = xscreensaver-getimage.c \ + rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \ + rotor.c ant.c xjack.c xlyap.c \ + cynosure.c moire2.c flow.c epicycle.c interference.c \ +- truchet.c bsod.c crystal.c discrete.c distort.c kumppa.c \ ++ truchet.c crystal.c discrete.c distort.c kumppa.c \ + demon.c loop.c t3d.c penetrate.c deluxe.c compass.c \ + squiral.c xflame.c wander.c spotlight.c critical.c \ + phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \ +@@ -142,7 +142,7 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ + rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \ + rotor.o ant.o xjack.o xlyap.o xscreensaver-getimage.o \ + cynosure.o moire2.o flow.o epicycle.o interference.o \ +- truchet.o bsod.o crystal.o discrete.o distort.o kumppa.o \ ++ truchet.o crystal.o discrete.o distort.o kumppa.o \ + demon.o loop.o t3d.o penetrate.o deluxe.o compass.o \ + squiral.o xflame.o wander.o spotlight.o critical.o \ + phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \ +@@ -171,7 +171,7 @@ EXES = attraction blitspin bouboule braid decayscreen deco \ + slip strange swirl goop starfish munch \ + fadeplot rd-bomb coral mountain triangle \ + xjack xlyap cynosure moire2 flow epicycle \ +- interference truchet bsod crystal discrete distort kumppa \ ++ interference truchet crystal discrete distort kumppa \ + demon loop penetrate deluxe compass squiral xflame \ + wander spotlight phosphor xmatrix petri shadebobs \ + ccurve blaster bumps ripples xspirograph \ +@@ -210,7 +210,7 @@ HDRS = screenhack.h screenhackI.h fps.h fpsI.h xlockmore.h \ + apple2.h analogtv.h pacman.h pacman_ai.h pacman_level.h \ + asm6502.h delaunay.h recanim.h + MEN = anemone.man apollonian.man attraction.man \ +- blaster.man blitspin.man bouboule.man braid.man bsod.man \ ++ blaster.man blitspin.man bouboule.man braid.man \ + bumps.man ccurve.man compass.man coral.man \ + crystal.man cynosure.man decayscreen.man \ + deco.man deluxe.man demon.man discrete.man distort.man \ +@@ -661,9 +661,6 @@ interference: interference.o $(HACK_OBJS) $(COL) $(SHM) $(THRO) $(DBE) + truchet: truchet.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) + +-bsod: bsod.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG) +- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(PNG) $(PNG_LIBS) $(THRL) +- + apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) + $(CC_HACK) -o $@ $@.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PNG) $(PNG_LIBS) $(TEXT_LIBS) $(THRL) + +@@ -1294,41 +1291,6 @@ braid.o: $(UTILS_SRC)/xft.h + braid.o: $(UTILS_SRC)/yarandom.h + braid.o: $(srcdir)/xlockmoreI.h + braid.o: $(srcdir)/xlockmore.h +-bsod.o: $(srcdir)/analogtv.h +-bsod.o: $(srcdir)/apple2.h +-bsod.o: ../config.h +-bsod.o: $(srcdir)/fps.h +-bsod.o: images/gen/amiga_png.h +-bsod.o: images/gen/android_png.h +-bsod.o: images/gen/apple_png.h +-bsod.o: images/gen/atari_png.h +-bsod.o: images/gen/atm_png.h +-bsod.o: images/gen/dvd_png.h +-bsod.o: images/gen/gnome1_png.h +-bsod.o: images/gen/gnome2_png.h +-bsod.o: images/gen/hmac_png.h +-bsod.o: images/gen/macbomb_png.h +-bsod.o: images/gen/mac_png.h +-bsod.o: images/gen/osx_10_2_png.h +-bsod.o: images/gen/osx_10_3_png.h +-bsod.o: images/gen/ransomware_png.h +-bsod.o: images/gen/sun_png.h +-bsod.o: $(srcdir)/recanim.h +-bsod.o: $(srcdir)/screenhackI.h +-bsod.o: $(srcdir)/screenhack.h +-bsod.o: $(UTILS_SRC)/aligned_malloc.h +-bsod.o: $(UTILS_SRC)/colors.h +-bsod.o: $(UTILS_SRC)/font-retry.h +-bsod.o: $(UTILS_SRC)/grabscreen.h +-bsod.o: $(UTILS_SRC)/hsv.h +-bsod.o: $(UTILS_SRC)/resources.h +-bsod.o: $(UTILS_SRC)/thread_util.h +-bsod.o: $(UTILS_SRC)/usleep.h +-bsod.o: $(UTILS_SRC)/visual.h +-bsod.o: $(UTILS_SRC)/xft.h +-bsod.o: $(UTILS_SRC)/xshm.h +-bsod.o: $(UTILS_SRC)/yarandom.h +-bsod.o: $(srcdir)/ximage-loader.h + bubbles-default.o: $(srcdir)/bubbles.h + bubbles-default.o: ../config.h + bubbles-default.o: images/gen/blood10_png.h From 45b7448e49796a158f6a417171e17dfaf88d2375 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 25 2022 20:29:37 +0000 Subject: [PATCH 69/200] libreboot-utils: Add ich9utils Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD index 54efd8e..77f3b3f 100644 --- a/pcr/libreboot-utils/PKGBUILD +++ b/pcr/libreboot-utils/PKGBUILD @@ -4,7 +4,7 @@ # Maintainers: Parabola hackers pkgname=libreboot-utils -pkgrel=1 +pkgrel=2 _upstream_ver=20220710 pkgver=4.15.libreboot${_upstream_ver} pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" @@ -57,6 +57,10 @@ prepare() { } build() { + # Build ich9deblob, ich9gen, demefactory, ich9show, etc + cd "$srcdir/libreboot-${_upstream_ver}_src" + make -C ich9utils + # Get to the directory. cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/" @@ -106,12 +110,18 @@ build() { } package() { - # Get to the directory. - cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/" - # Set directories up. install -d "${pkgdir}"/usr/bin "${pkgdir}"/usr/share/man/man8 + # Install ich9deblob, ich9gen, demefactory, ich9show, etc + cd "$srcdir/libreboot-${_upstream_ver}_src/ich9utils" + for binary in ich9deblob ich9gen demefactory ich9show ; do + install -Dm755 "${binary}" "${pkgdir}"/usr/bin/"${binary}" + done + + # Get to the directory. + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/" + # These tools uses port-mapped I/O which doesn't exist on armv7h, # so they fails to compile when including sys/io.h. So we also need # to skip their installation. From d5b3523baac347176c4592b9880a6032b7dde27f Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 25 2022 20:50:07 +0000 Subject: [PATCH 70/200] Add fcode-utils Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/fcode-utils/PKGBUILD b/pcr/fcode-utils/PKGBUILD new file mode 100644 index 0000000..4831c26 --- /dev/null +++ b/pcr/fcode-utils/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer (AUR): Jean Lucas +# Maintainers: Parabola hackers + +# parabola changes and rationale: +# - Updated to version 1.0.3 + +pkgname=fcode-utils +pkgver=1.0.3 +pkgrel=1 +pkgdesc="Utilities to process FCODE, OpenFirmware's byte code" +arch=(i686 x86_64) +url=https://www.openfirmware.info/FCODE_suite +license=(GPL2) +depends=(glibc) +provides=(romheaders) +conflicts=(fcode-utils-git) +source=(https://github.com/openbios/fcode-utils/archive/v$pkgver.tar.gz) +sha512sums=('7f64d3ac5c10184efc0993a748a5dcbf9aa0b71dee059c9b97b3656e61cdd7ed9395e830435eab5878ece80df001cf9420065b1611e8bb011274e26aad20f3f0') + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + install -D detok/detok romheaders/romheaders toke/toke -t "$pkgdir"/usr/bin + install -Dm 644 README -t "$pkgdir"/usr/share/doc/fcode-utils + install -Dm 644 COPYING "$pkgdir"/usr/share/licenses/fcode-utils/LICENSE +} From 3176d86b1ebcaad1caf7f318507ca16e5f0b4ae1 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 26 2022 00:07:04 +0000 Subject: [PATCH 71/200] pcr: fcode-utils: add armv7h support Since we didn't librerelease any packages yet, we don't need to increase the pkgrel. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/fcode-utils/PKGBUILD b/pcr/fcode-utils/PKGBUILD index 4831c26..6a058f9 100644 --- a/pcr/fcode-utils/PKGBUILD +++ b/pcr/fcode-utils/PKGBUILD @@ -3,12 +3,13 @@ # parabola changes and rationale: # - Updated to version 1.0.3 +# - Added armv7h support pkgname=fcode-utils pkgver=1.0.3 pkgrel=1 pkgdesc="Utilities to process FCODE, OpenFirmware's byte code" -arch=(i686 x86_64) +arch=(armv7h i686 x86_64) url=https://www.openfirmware.info/FCODE_suite license=(GPL2) depends=(glibc) From 57f0d7083ac59afee3eb54c0a0253ac4ebbed123 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Aug 27 2022 13:01:41 +0000 Subject: [PATCH 72/200] pcr: Add prosody-modules GNUtoo: commit message, added -f ${nonfree_file}, added hg revision and comments about it, removed #pkgname=prosody-community-modules. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/prosody-modules/PKGBUILD b/pcr/prosody-modules/PKGBUILD new file mode 100644 index 0000000..adc15cf --- /dev/null +++ b/pcr/prosody-modules/PKGBUILD @@ -0,0 +1,76 @@ +# Copyright (C) 2022 Wael Karram +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: Parabola hackers + +# The prosody-modules repository doesn't have tags that correspond to +# the prosody releases. In the prosody source code we have: +# $ hg tags | grep "^0.12.1" +# 0.12.1 12526:252ed01896dd +# $ hg log +# [...] +# changeset: 12543:cf29bdb74c15 +# branch: 0.12 +# parent: 12526:252ed01896dd +# user: Matthew Wild +# date: Thu Jun 09 12:42:57 2022 +0100 +# summary: Added tag 0.12.1 for changeset 252ed01896dd +# [...] +# changeset: 12526:252ed01896dd +# branch: 0.12 +# tag: 0.12.1 +# user: Kim Alvefur +# date: Fri May 27 14:45:35 2022 +0200 +# summary: mod_smacks: Bounce unhandled stanzas from local origin (fix #1759) +# So we used the revision 4959:0989dea9b356 +# and in prosody-modules we have: +# $ hg log +# changeset: 4960:59bedf167910 +# user: Kim Alvefur +# date: Mon Jun 13 14:25:39 2022 +0200 +# summary: mod_muc_ping: Remove since Prosody mod_muc 0.11+ covers this natively +# +# changeset: 4959:0989dea9b356 +# user: Kim Alvefur +# date: Sun Jun 05 21:59:17 2022 +0200 +# summary: mod_rest: Add various things to openapi spec +# So we used the commit right before June 09 to correspond to the prosody release + +pkgname=prosody-modules +pkgver=0.12.1 +pkgrel=1 +pkgdesc="Prosody community modules, includes experimental ones." +arch=('any') +url="https://modules.prosody.im/" +license=('MIT') +depends=('prosody') +makedepends=('mercurial') +mksource=("${pkgname}-${pkgver}::hg+https://hg.prosody.im/prosody-modules/#revision=4959:0989dea9b356") +source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}") +mksha1sums=('SKIP') +sha1sums=('SKIP') + +mksource() { + cd "${srcdir}/${pkgname}-${pkgver}/" + # Clean up mercurial files. + # Remove broken, unmaintained and unlicensed modules: + # Note that only mod_admin_web seems to downloand nonfree dependencies through a script, and needs better inspection. + # The rest are unlicensed, unmaintained or invasive to user privacy. + local nonfree_files=( \.hg \.hgtags mod_admin_web mod_auth_external_insecure mod_bookmarks mod_captcha_registrations mod_compression_unsafe mod_couchdb mod_easy_invite mod_graceful_shutdown mod_pubsub_feeds mod_s2s_auth_monkeysphere mod_twitter mod_aws_profile mod_conversejs mod_pubsub_github mod_pubsub_twitter mod_s2s_auth_posh mod_sentry mod_slack_webhooks mod_sms_free mod_sms_clickatel mod_tweet_data ) + for nonfree_file in "${nonfree_files[@]}" + do if [[ -d ${nonfree_file} || -f ${nonfree_file} ]] + then + echo "deleting ${nonfree_file}" + rm -rf ${nonfree_file} + else + echo "cannot delete '${nonfree_file}' - mksource() needs re-working" + return 1 + fi + done +} + +package() { + # Make sure that the modules path exists. + mkdir -p "${pkgdir}/usr/lib/prosody/modules/" + # Copy the modules. + cp -r "${srcdir}/${pkgname}-${pkgver}/" "${pkgdir}/usr/lib/prosody/modules/" +} From a0e6ce8cbfcd979242e6bfddd39faa6e0cb316e4 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 27 2022 13:14:40 +0000 Subject: [PATCH 73/200] pcr: prosody-modules: Explain what is removed The information on the removals is based on the "modules_requiring_special_treatment" file that has been sent by Wael (the PKGBUILD author) on the parabola dev mailing list. The pkgrev was not bumped because this commit should contain no functional changes, and also because a packages were not built and released yet. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/prosody-modules/PKGBUILD b/pcr/prosody-modules/PKGBUILD index adc15cf..dd41729 100644 --- a/pcr/prosody-modules/PKGBUILD +++ b/pcr/prosody-modules/PKGBUILD @@ -52,20 +52,70 @@ sha1sums=('SKIP') mksource() { cd "${srcdir}/${pkgname}-${pkgver}/" # Clean up mercurial files. - # Remove broken, unmaintained and unlicensed modules: - # Note that only mod_admin_web seems to downloand nonfree dependencies through a script, and needs better inspection. - # The rest are unlicensed, unmaintained or invasive to user privacy. - local nonfree_files=( \.hg \.hgtags mod_admin_web mod_auth_external_insecure mod_bookmarks mod_captcha_registrations mod_compression_unsafe mod_couchdb mod_easy_invite mod_graceful_shutdown mod_pubsub_feeds mod_s2s_auth_monkeysphere mod_twitter mod_aws_profile mod_conversejs mod_pubsub_github mod_pubsub_twitter mod_s2s_auth_posh mod_sentry mod_slack_webhooks mod_sms_free mod_sms_clickatel mod_tweet_data ) - for nonfree_file in "${nonfree_files[@]}" - do if [[ -d ${nonfree_file} || -f ${nonfree_file} ]] - then - echo "deleting ${nonfree_file}" - rm -rf ${nonfree_file} - else - echo "cannot delete '${nonfree_file}' - mksource() needs re-working" - return 1 - fi - done + rm -rf \.hg \.hgtags + + # Seems to download external dependencies, needs inspection. + rm -rf mod_admin_web + + # Unmaintained and shouldn't be used. + rm -rf mod_auth_external_insecure + + # Connects to AWS. + rm -rf mod_aws_profile + + # Depricated, might conflict with built-in module. + rm -rf mod_bookmarks + + # Requires modification to prosody core. + rm -rf mod_captcha_registrations + + # Unsafe and unmaintained. + rm -rf mod_compression_unsafe + + # Relies on conversejs' CDN, free software though. + rm -rf mod_conversejs + + # Seems abandoned. + rm -rf mod_couchdb + + # Deprecated. + rm -rf mod_easy_invite + + # Integrated into core prosody software. + rm -rf mod_graceful_shutdown + + # Seems to include unlicensed code. + rm -rf mod_pubsub_feeds + + # Relies on github network services. + rm -rf mod_pubsub_github + + # relies on twitter network services and API. + rm -rf mod_pubsub_twitter + + # Monkeysphere project seems to be defunct. + rm -rf mod_s2s_auth_monkeysphere + + # Relies on nonfree network services. + rm -rf mod_s2s_auth_posh + + # Relies on nonfree network services. + rm -rf mod_sentry + + # relies on nonfree network services. + rm -rf mod_slack_webhooks + + # Relies on nonfree network services. + rm -rf mod_sms_clickatel + + # Relies on nonfree network services. + rm -rf mod_sms_free + + # Relies on nonfree network services. + rm -rf mod_tweet_data + + # Relies on nonfree network services and unfinished/unmaintained. + rm -rf mod_twitter } package() { From 3e90ee2fb3bcc5cb054ac512a5065156b2afb7b5 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 27 2022 23:45:54 +0000 Subject: [PATCH 74/200] libretools: librefetch: fix "does not contain a valid package suffix" Without that fix we have the following error when trying to build a tarball that needs to be created with librefetch: $PKGEXT does not contain a valid package suffix (needs '.pkg.tar*', got '-.pkg.tar.xz') I was told by bill-auger on #parabola that it could be fixed by applying this change: https://git.parabola.nu/packages/libretools.git/commit/?h=wip-2022-01&id=23321a3f77ecbb76b4fc79adfbf212d07dc3a0f1 So I'm adding this patch to the libretools package. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index df09832..ec12245 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -12,11 +12,13 @@ license=('GPL3' 'GPL2') pkgver=20220118 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} 0001-libremakepkg-rw-startdir.patch - 0002-libremakepkg-pacman_5_2.patch) + 0002-libremakepkg-pacman_5_2.patch + librefetch-pkgext.patch) sha256sums=('033fe25cd972296b7fc8b5c05ef048fac296194a3b24e4cf6459544616ada49c' 'SKIP' '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883' - '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') + '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df' + 'SKIP') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker 'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin @@ -36,6 +38,7 @@ prepare() { cd "$srcdir/$pkgbase-$pkgver" patch -N -p1 -i $srcdir/0001-libremakepkg-rw-startdir.patch patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch + patch -N -p1 -i $srcdir/librefetch-pkgext.patch } build() { diff --git a/libre/libretools/librefetch-pkgext.patch b/libre/libretools/librefetch-pkgext.patch new file mode 100644 index 0000000..9fede99 --- /dev/null +++ b/libre/libretools/librefetch-pkgext.patch @@ -0,0 +1,12 @@ +Index: libretools-20220118/src/librefetch/librefetch +=================================================================== +--- libretools-20220118.orig/src/librefetch/librefetch ++++ libretools-20220118/src/librefetch/librefetch +@@ -221,7 +221,6 @@ doit() { + mv -f "$base_dst" "$dst" + fi + else +- export PKGEXT=${base_dst##*/} + export PKGDEST=${dst%/*} + export pkg_file=$dst + From 461e88c9d43d0c7d8b6b8dccb4180e94654d21d2 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 28 2022 09:37:12 +0000 Subject: [PATCH 75/200] pcr: prosody-modules: fix unknown revision '4959:0989dea9b356' Without that fix, we have: | ==> Retrieving sources... | -> Updating prosody-modules-0.12.1 hg repo... | pulling from https://hg.prosody.im/prosody-modules/ | searching for changes | no changes found | ==> Validating source files with sha1sums... | prosody-modules-0.12.1 ... Skipped | ==> Extracting sources... | -> Creating working copy of hg repo... | abort: unknown revision '4959:0989dea9b356' | ==> ERROR: Failure while creating working copy of hg repo | Aborting... | ==> ERROR: Failure while downloading https://repo.parabola.nu/other/prosody-modules-libre/prosody-modules-libre-0.12.1 | Aborting... | ==> ERROR: Could not download sources. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/pcr/prosody-modules/PKGBUILD b/pcr/prosody-modules/PKGBUILD index dd41729..35495dc 100644 --- a/pcr/prosody-modules/PKGBUILD +++ b/pcr/prosody-modules/PKGBUILD @@ -44,7 +44,7 @@ url="https://modules.prosody.im/" license=('MIT') depends=('prosody') makedepends=('mercurial') -mksource=("${pkgname}-${pkgver}::hg+https://hg.prosody.im/prosody-modules/#revision=4959:0989dea9b356") +mksource=("${pkgname}-${pkgver}::hg+https://hg.prosody.im/prosody-modules/#revision=4959") source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}") mksha1sums=('SKIP') sha1sums=('SKIP') From 0e699432f1eb2655bc1fdc1e404f057436c68676 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Aug 28 2022 09:38:08 +0000 Subject: [PATCH 76/200] libre: libretools: add in forgetten pkgrel bump I forgot to do some git add before pushing last time, so it didn't pick the pkgrel along the way. Signed-off-by: Denis 'GNUtoo' Carikli --- diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index ec12245..9126f79 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -22,7 +22,7 @@ sha256sums=('033fe25cd972296b7fc8b5c05ef048fac296194a3b24e4cf6459544616ada49c' validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker 'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin -pkgrel=6.2 +pkgrel=6.3 arch=('any') makedepends=(ruby-ronn) checkdepends=( From 363a99c93f7ae12986c9da8d318558e5bffe214b Mon Sep 17 00:00:00 2001 From: David P Date: Sep 03 2022 02:36:30 +0000 Subject: [PATCH 77/200] drop qtqr, now in [community] Signed-off-by: David P --- diff --git a/pcr/qtqr/PKGBUILD b/pcr/qtqr/PKGBUILD deleted file mode 100644 index d3ff33c..0000000 --- a/pcr/qtqr/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: David P. - -_python="python2" -_name="qr-tools" -_ubuntur="0~23~ubuntu16.10.1" -pkgname="qtqr" -pkgver="1.4" -pkgrel="1" -pkgdesc="A Graphical interface QR Code generator and decoder." -url="https://launchpad.net/qr-tools" -arch=('i686' 'x86_64') -license=('GPL3') -depends=("${_python}" "${_python}-qrtools" "${_python}-pyqt4") -provides=("${pkgname}") -source=("https://launchpad.net/~${_name}-developers/+archive/ubuntu/daily/+files/${pkgname}_${pkgver}-${_ubuntur}.tar.gz") -sha256sums=('b1d3ba45594ddacd96c2da906b8ed90a0f0f50cc0348b9d2435ff11c93eebae1') - -_qtqr_desktop="[Desktop Entry] -Name=QtQR -Comment=QtQR is a Qt based software that let's you generate QR Codes easily, scan an image file for QR Codes and decode them or use your webcam to scan a printed one. -Exec=qtqr -Icon=qtqr -Terminal=false -Type=Application -Categories=Graphics" - -build() { - cd "${pkgname}-${pkgver}" - echo -e "$_qtqr_desktop" | tee "${pkgname}.desktop" - sed -i 's/env python/env python2/' "${pkgname}.py" -} - -package() { - cd "${pkgname}-${pkgver}" - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/share/${pkgname}/samples - install -d ${pkgdir}/usr/share/applications - install -d ${pkgdir}/usr/share/pixmaps - install -d ${pkgdir}/usr/share/qt4/translations - - install -m 755 qtqr.py ${pkgdir}/usr/bin/qtqr - install -m 644 samples/* ${pkgdir}/usr/share/${pkgname}/samples - install -m 644 qtqr.desktop ${pkgdir}/usr/share/applications - install -m 644 icon.png ${pkgdir}/usr/share/pixmaps/qtqr.png - install -m 644 *.qm ${pkgdir}/usr/share/qt4/translations - - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -# vim:set ts=4 sw=2 ft=sh et: From 89875c1c8ce5fbebb583c93b92890561d9ba0011 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sep 03 2022 23:05:45 +0000 Subject: [PATCH 78/200] libre/iceweasel: 104.0-1.parabola1 --- diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 6df6152..2b77e15 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -1,4 +1,4 @@ -From e63cc6359790ab8d7139bf9cdf8e3b527ba780e6 Mon Sep 17 00:00:00 2001 +From 07801d1961effd9182c80a990a23f338e3972efb Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:20:39 +0200 Subject: [PATCH 01/13] Point to local omni.ja files, not remote server @@ -26,18 +26,19 @@ If necessary, missing files can be added later. .../newtab/data/content/activity-stream.bundle.js | 2 +- services/settings/Utils.jsm | 2 +- .../periodic-updates/scripts/periodic_file_updates.sh | 2 +- - toolkit/components/search/SearchUtils.jsm | 8 ++++---- + .../components/backgroundtasks/BackgroundTask_message.jsm | 4 ++-- + toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- toolkit/components/search/docs/DefaultSearchEngines.rst | 2 +- .../components/search/docs/SearchEngineConfiguration.rst | 2 +- toolkit/modules/AppConstants.jsm | 4 ++-- toolkit/mozapps/defaultagent/RemoteSettings.cpp | 2 +- - 9 files changed, 13 insertions(+), 13 deletions(-) + 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -index 0a9da8d804..fdc387aa63 100644 +index e663fbd32b..a7b7a1994f 100644 --- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx +++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx -@@ -1226,7 +1226,7 @@ export class ASRouterAdminInner extends React.PureComponent { +@@ -1116,7 +1116,7 @@ export class ASRouterAdminInner extends React.PureComponent { nimbus-desktop-experiments diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index cb7c26e729..696813dd53 100644 +index 938b44f87b..cdfd5b8589 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { +@@ -1487,7 +1487,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { className: "providerUrl", target: "_blank", @@ -60,10 +61,10 @@ index cb7c26e729..696813dd53 100644 }, "nimbus-desktop-experiments"), ")"); } diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 23d6bf1a20..6f87bfa812 100644 +index a8b0c67ce1..9761486718 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -108,7 +108,7 @@ var Utils = { +@@ -107,7 +107,7 @@ var Utils = { : AppConstants.REMOTE_SETTINGS_SERVER_URL; }, @@ -73,7 +74,7 @@ index 23d6bf1a20..6f87bfa812 100644 /** * Logger instance. diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh -index 3bc70462c4..dc9592c9fa 100755 +index f177a1440c..c41b0beece 100755 --- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh +++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh @@ -285,7 +285,7 @@ function compare_suffix_lists { @@ -85,11 +86,26 @@ index 3bc70462c4..dc9592c9fa 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" -diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm -index a3100fac89..3720829575 100644 ---- a/toolkit/components/search/SearchUtils.jsm -+++ b/toolkit/components/search/SearchUtils.jsm -@@ -157,13 +157,13 @@ var SearchUtils = { +diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm +index 55e8f70e77..2b5167b36b 100644 +--- a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm ++++ b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm +@@ -19,8 +19,8 @@ + // environment variables still apply. + // + // --stage: use stage Remote Settings +-// (`https://settings-cdn.stage.mozaws.net/v1`) rather than production +-// (`https://firefox.settings.services.mozilla.com/v1`) ++// (`resource://app/defaults/settings/`) rather than production ++// (`resource://app/defaults/settings/`) + // + // --preview: enable Remote Settings and Experiment previews. + // +diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs +index a3072d19b3..d24df38913 100644 +--- a/toolkit/components/search/SearchUtils.sys.mjs ++++ b/toolkit/components/search/SearchUtils.sys.mjs +@@ -154,13 +154,13 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -129,10 +145,10 @@ index c782f9f7c3..4d773d27c5 100644 +.. _viewed live: resource://app/defaults/settings/main/search-config.json .. _Normandy: /toolkit/components/normandy/normandy/services.html diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm -index 9311d06758..fd87704d83 100644 +index 15125bcca0..1b3e502730 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm -@@ -423,9 +423,9 @@ var AppConstants = Object.freeze({ +@@ -420,9 +420,9 @@ var AppConstants = Object.freeze({ REMOTE_SETTINGS_SERVER_URL: #ifdef MOZ_THUNDERBIRD @@ -158,10 +174,10 @@ index 667d9fc628..b2bf628f29 100644 #define PROD_CID "windows-default-browser-agent" #define PROD_ID "state" -- -2.37.1 +2.37.2 -From 1b75c1b90928d362b6b7723b57c3c0d501145807 Mon Sep 17 00:00:00 2001 +From 70b74406d004aa6a4da38d179495f767ec583e58 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:34:08 +0200 Subject: [PATCH 02/13] Remove polling triggered by push broadcasts @@ -178,7 +194,7 @@ service. 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm -index 85c1bf6634..d2094ebb9c 100644 +index 80df53ee49..109d602d4a 100644 --- a/dom/push/PushBroadcastService.jsm +++ b/dom/push/PushBroadcastService.jsm @@ -179,6 +179,19 @@ var BroadcastService = class { @@ -202,10 +218,10 @@ index 85c1bf6634..d2094ebb9c 100644 * Call the listeners of the specified broadcasts. * diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js -index bfe9226f88..01abff0fb1 100644 +index 44727dfc0e..ece21d09bc 100644 --- a/services/settings/remote-settings.js +++ b/services/settings/remote-settings.js -@@ -580,11 +580,7 @@ function remoteSettingsFunction() { +@@ -582,11 +582,7 @@ function remoteSettingsFunction() { moduleURI: __URI__, symbolName: "remoteSettingsBroadcastHandler", }; @@ -218,7 +234,7 @@ index bfe9226f88..01abff0fb1 100644 }; return remoteSettings; -@@ -604,9 +600,6 @@ var remoteSettingsBroadcastHandler = { +@@ -606,9 +602,6 @@ var remoteSettingsBroadcastHandler = { `Push notification received (version=${version} phase=${phase})` ); @@ -230,10 +246,10 @@ index bfe9226f88..01abff0fb1 100644 }, }; -- -2.37.1 +2.37.2 -From 8b367f58916f12d73a392fa629673e3a797a1a64 Mon Sep 17 00:00:00 2001 +From 9f91207a91cb895a67f90f5e2e4e3968e8bd7b0e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:41:54 +0200 Subject: [PATCH 03/13] Remove timer that triggers polling for changes @@ -274,10 +290,10 @@ index 3bfed26ea4..807eb220ec 100644 -# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155 -category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200 -- -2.37.1 +2.37.2 -From ea39895fee8e1dcf71b8779d33ae641a30dca384 Mon Sep 17 00:00:00 2001 +From 8f0541899626807c4cb11996b5763463f3b9dc6f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:47:41 +0200 Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally @@ -296,10 +312,10 @@ code that expects them. create mode 100644 services/settings/dumps/monitor/moz.build diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 73a41dc25b..04c2a3fb6a 100644 +index 14e582fc61..821b1e2167 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -275,6 +275,7 @@ +@@ -259,6 +259,7 @@ @RESPATH@/browser/defaults/settings/last_modified.json @RESPATH@/browser/defaults/settings/blocklists @RESPATH@/browser/defaults/settings/main @@ -308,10 +324,10 @@ index 73a41dc25b..04c2a3fb6a 100644 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 6f87bfa812..8f878754a5 100644 +index 9761486718..da55d60201 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -380,7 +380,7 @@ var Utils = { +@@ -379,7 +379,7 @@ var Utils = { async fetchLatestChanges(serverUrl, options = {}) { const { expectedTimestamp, lastEtag = "", filters = {} } = options; @@ -320,7 +336,7 @@ index 6f87bfa812..8f878754a5 100644 const params = { ...filters, _expected: expectedTimestamp ?? 0, -@@ -395,7 +395,11 @@ var Utils = { +@@ -394,7 +394,11 @@ var Utils = { .map(([k, v]) => `${k}=${encodeURIComponent(v)}`) .join("&"); } @@ -333,7 +349,7 @@ index 6f87bfa812..8f878754a5 100644 if (response.status >= 500) { throw new Error(`Server error ${response.status} ${response.statusText}`); -@@ -430,7 +434,15 @@ var Utils = { +@@ -429,7 +433,15 @@ var Utils = { } } @@ -377,10 +393,10 @@ index f407580bfa..53e9d8b45e 100644 ] -- -2.37.1 +2.37.2 -From 442dd6b2fff0cd43c9e7e43d1d2bd63269ddc3c2 Mon Sep 17 00:00:00 2001 +From dca0c5d7c983a24d742c45705a899430afed41bd Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:52:10 +0200 Subject: [PATCH 05/13] Utils: disable offline checking @@ -392,10 +408,10 @@ current and any future code that relies on it. 1 file changed, 10 deletions(-) diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 8f878754a5..fdf7181c14 100644 +index da55d60201..ff45380ff8 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -194,16 +194,6 @@ var Utils = { +@@ -193,16 +193,6 @@ var Utils = { * @return {bool} Whether network is down or not. */ get isOffline() { @@ -413,10 +429,10 @@ index 8f878754a5..fdf7181c14 100644 }, -- -2.37.1 +2.37.2 -From c2f06f79b0d5d78ab3a81ec7f85053d7b3e761af Mon Sep 17 00:00:00 2001 +From 1e29854983d5fcc360a6b407b4cd11f6af8d993e Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 17:56:02 +0200 Subject: [PATCH 06/13] Refactor hashing logic to a separate function @@ -429,7 +445,7 @@ integrity checking of the locally cached data. 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm -index 9fc1794f90..50e69f56a0 100644 +index 2e8073271b..24b4ce2af8 100644 --- a/services/settings/RemoteSettingsWorker.jsm +++ b/services/settings/RemoteSettingsWorker.jsm @@ -191,6 +191,10 @@ class Worker { @@ -467,10 +483,10 @@ index 9804e80c91..de67b0fb6f 100644 /** -- -2.37.1 +2.37.2 -From f9aa27662b2018a543d71e2443397beecc73ee5e Mon Sep 17 00:00:00 2001 +From 49543366ee33ad44a5577d082e51a11a2e7b4b7f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:05:02 +0200 Subject: [PATCH 07/13] Client: Fetch and hash records from local dump @@ -505,10 +521,10 @@ the upgrade to local-only setup. 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index 2b07a06b26..77da7304b6 100644 +index ae94f272d8..75589ff02e 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -668,11 +668,9 @@ class RemoteSettingsClient extends EventEmitter { +@@ -678,11 +678,9 @@ class RemoteSettingsClient extends EventEmitter { // If the data is up-to-date but don't have metadata (records loaded from dump), // we fetch them and validate the signature immediately. @@ -522,7 +538,7 @@ index 2b07a06b26..77da7304b6 100644 await this.db.importChanges(metadata); // We don't bother validating the signature if the dump was just loaded. We do // if the dump was loaded at some other point (eg. from .get()). -@@ -935,33 +933,23 @@ class RemoteSettingsClient extends EventEmitter { +@@ -945,33 +943,23 @@ class RemoteSettingsClient extends EventEmitter { * @returns {Promise} */ async _validateCollectionSignature(records, timestamp, metadata) { @@ -562,7 +578,7 @@ index 2b07a06b26..77da7304b6 100644 )) ) { throw new InvalidSignatureError(this.identifier); -@@ -1134,24 +1122,27 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1144,24 +1132,27 @@ class RemoteSettingsClient extends EventEmitter { * @param since timestamp of last sync (optional) */ async _fetchChangeset(expectedTimestamp, since) { @@ -607,10 +623,10 @@ index 2b07a06b26..77da7304b6 100644 remoteRecords, }; -- -2.37.1 +2.37.2 -From aa6967b7f10899464253074271f27180ca4069fe Mon Sep 17 00:00:00 2001 +From b6ce5faacf9bdf97066c7182399b58d5ef91a445 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:42:56 +0200 Subject: [PATCH 08/13] Client: start deferred sync on get() or on() @@ -632,10 +648,10 @@ occurs during the session. 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index 77da7304b6..81404d9801 100644 +index 75589ff02e..90280fc848 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -23,6 +23,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { +@@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.jsm", Database: "resource://services-settings/Database.jsm", @@ -643,7 +659,7 @@ index 77da7304b6..81404d9801 100644 IDBHelpers: "resource://services-settings/IDBHelpers.jsm", KintoHttpClient: "resource://services-common/kinto-http-client.js", ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", -@@ -33,6 +34,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { +@@ -32,6 +33,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { }); const TELEMETRY_COMPONENT = "remotesettings"; @@ -651,7 +667,7 @@ index 77da7304b6..81404d9801 100644 XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log); -@@ -320,6 +322,11 @@ class RemoteSettingsClient extends EventEmitter { +@@ -319,6 +321,11 @@ class RemoteSettingsClient extends EventEmitter { this._lastCheckTimePref = lastCheckTimePref; this._verifier = null; this._syncRunning = false; @@ -663,7 +679,7 @@ index 77da7304b6..81404d9801 100644 // This attribute allows signature verification to be disabled, when running tests // or when pulling data from a dev server. -@@ -349,6 +356,11 @@ class RemoteSettingsClient extends EventEmitter { +@@ -348,6 +355,11 @@ class RemoteSettingsClient extends EventEmitter { this.db.identifier = this.identifier; } @@ -675,7 +691,7 @@ index 77da7304b6..81404d9801 100644 get identifier() { return `${this.bucketName}/${this.collectionName}`; } -@@ -417,6 +429,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -419,6 +431,10 @@ class RemoteSettingsClient extends EventEmitter { let lastModified = await this.db.getLastModified(); let hasLocalData = lastModified !== null; @@ -686,7 +702,7 @@ index 77da7304b6..81404d9801 100644 if (syncIfEmpty && !hasLocalData) { // .get() was called before we had the chance to synchronize the local database. // We'll try to avoid returning an empty list. -@@ -517,7 +533,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -527,7 +543,10 @@ class RemoteSettingsClient extends EventEmitter { // No need to verify signature on JSON dumps. // If local DB cannot be read, then we don't even try to do anything, // we return results early. @@ -698,7 +714,7 @@ index 77da7304b6..81404d9801 100644 } lazy.console.debug( -@@ -557,6 +576,12 @@ class RemoteSettingsClient extends EventEmitter { +@@ -567,6 +586,12 @@ class RemoteSettingsClient extends EventEmitter { return final; } @@ -712,10 +728,10 @@ index 77da7304b6..81404d9801 100644 * Synchronize the local database with the remote server. * -- -2.37.1 +2.37.2 -From d38df88747ef8df356af5178fde18bf3a25836b6 Mon Sep 17 00:00:00 2001 +From 617d90b265e5d82aa964247f3bd68eb92ebd2cf0 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 18:53:51 +0200 Subject: [PATCH 09/13] Client: deep compare records if timestamps match @@ -737,10 +753,10 @@ noticeable performance issues. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index 81404d9801..c06650e2d8 100644 +index 90280fc848..3d9f04696f 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -20,6 +20,7 @@ const { Downloader } = ChromeUtils.import( +@@ -19,6 +19,7 @@ const { Downloader } = ChromeUtils.import( const lazy = {}; XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -748,7 +764,7 @@ index 81404d9801..c06650e2d8 100644 ClientEnvironmentBase: "resource://gre/modules/components-utils/ClientEnvironment.jsm", Database: "resource://services-settings/Database.jsm", -@@ -1122,7 +1123,10 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1132,7 +1133,10 @@ class RemoteSettingsClient extends EventEmitter { const old = oldById.get(r.id); if (old) { oldById.delete(r.id); @@ -761,10 +777,10 @@ index 81404d9801..c06650e2d8 100644 } } else { -- -2.37.1 +2.37.2 -From f746bdc4a82e8a29ea8a5470cb5cdedba6594dbc Mon Sep 17 00:00:00 2001 +From 66122f118e859c33f1d972b658340dfc43b4b875 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:01:39 +0200 Subject: [PATCH 10/13] Client: delete more data on cleanup @@ -782,10 +798,10 @@ logic gets the data about the attachments from those records. 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index c06650e2d8..d5d934447a 100644 +index 3d9f04696f..e102c8b89d 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -257,7 +257,7 @@ class AttachmentDownloader extends Downloader { +@@ -256,7 +256,7 @@ class AttachmentDownloader extends Downloader { allRecords .filter(r => !!r.attachment) .map(r => @@ -794,7 +810,7 @@ index c06650e2d8..d5d934447a 100644 ) ); } -@@ -1082,7 +1082,7 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1092,7 +1092,7 @@ class RemoteSettingsClient extends EventEmitter { // Signature failed, clear local DB because it contains // bad data (local + remote changes). lazy.console.debug(`${this.identifier} clear local data`); @@ -803,7 +819,7 @@ index c06650e2d8..d5d934447a 100644 // Local data was tampered, throw and it will retry from empty DB. lazy.console.error(`${this.identifier} local data was corrupted`); throw new CorruptedDataError(this.identifier); -@@ -1104,7 +1104,7 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1114,7 +1114,7 @@ class RemoteSettingsClient extends EventEmitter { // _importJSONDump() only clears DB if dump is available, // therefore do it here! if (imported < 0) { @@ -812,7 +828,7 @@ index c06650e2d8..d5d934447a 100644 } } } -@@ -1144,6 +1144,12 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1154,6 +1154,12 @@ class RemoteSettingsClient extends EventEmitter { return syncResult; } @@ -826,10 +842,10 @@ index c06650e2d8..d5d934447a 100644 * Fetch information from changeset endpoint. * -- -2.37.1 +2.37.2 -From 3e2487052231283079591eb158d6f45b43f1c091 Mon Sep 17 00:00:00 2001 +From 3ef189a633dfbe5a95cf5b290808b0003e8ba5c1 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:07:56 +0200 Subject: [PATCH 11/13] Client: remove comparison of collection timestamps @@ -844,10 +860,10 @@ necessary cleanup. So remove the checks. 1 file changed, 5 deletions(-) diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm -index d5d934447a..9a25d5103d 100644 +index e102c8b89d..9cb3455aaf 100644 --- a/services/settings/RemoteSettingsClient.jsm +++ b/services/settings/RemoteSettingsClient.jsm -@@ -1024,14 +1024,9 @@ class RemoteSettingsClient extends EventEmitter { +@@ -1034,14 +1034,9 @@ class RemoteSettingsClient extends EventEmitter { updated: [], deleted: [], }; @@ -863,10 +879,10 @@ index d5d934447a..9a25d5103d 100644 await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, { clear: retry, -- -2.37.1 +2.37.2 -From ba7f771d057358ae0575f0f392116b4406b6c1a5 Mon Sep 17 00:00:00 2001 +From 3d8d5ef12ab1c06cff841a9cca15a575750fc48d Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:15:44 +0200 Subject: [PATCH 12/13] Attachments: load only from dump and drop cached @@ -876,7 +892,7 @@ Subject: [PATCH 12/13] Attachments: load only from dump and drop cached 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm -index 5ac6249f67..9dc7bcdbf0 100644 +index 00bf059d55..979e22c06a 100644 --- a/services/settings/Attachments.jsm +++ b/services/settings/Attachments.jsm @@ -151,9 +151,10 @@ class Downloader { @@ -955,10 +971,10 @@ index 5ac6249f67..9dc7bcdbf0 100644 /** -- -2.37.1 +2.37.2 -From 1c0858235dd0f65b00ed622eac269d35c24ee458 Mon Sep 17 00:00:00 2001 +From 0ba5c3f95dd3c8a468d49c73b5067bd78deb1442 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 30 Dec 2020 19:22:20 +0200 Subject: [PATCH 13/13] Disable CRLite entirely for now @@ -983,10 +999,10 @@ certificate revocations. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml -index 79267cded6..d67f43052a 100644 +index 192915c16f..307f983896 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml -@@ -12446,7 +12446,7 @@ +@@ -12540,7 +12540,7 @@ # 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". - name: security.pki.crlite_mode type: RelaxedAtomicUint32 @@ -996,7 +1012,7 @@ index 79267cded6..d67f43052a 100644 - name: security.tls.version.min diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp -index 0996c198d2..f8525a9325 100644 +index aab4319651..f21432a7e3 100644 --- a/security/manager/ssl/nsNSSComponent.cpp +++ b/security/manager/ssl/nsNSSComponent.cpp @@ -1434,6 +1434,7 @@ void nsNSSComponent::setValidationOptions( @@ -1008,5 +1024,5 @@ index 0996c198d2..f8525a9325 100644 case CRLiteMode::Disabled: case CRLiteMode::TelemetryOnly: -- -2.37.1 +2.37.2 diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index c6afb8d..fc5381f 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=103.0 +pkgver=104.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -88,7 +88,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - zstandard-0.18.0.diff + zstandard-0.18.0.diff arc4random.diff $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -102,13 +102,14 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773' +sha256sums=('1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce' 'SKIP' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' + '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' - '1c385fa5b2e2dd1cb7404c2d101de499a6b4b1324ddc051c5fb94aea6c24b42a' + 'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8' @@ -213,6 +214,9 @@ prepare() { # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff + # Unbreak build with glibc 2.36 + patch -Np1 -i ../arc4random.diff + # echo -n "$_google_api_key" >google-api-key # anti-feature # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature diff --git a/libre/iceweasel/arc4random.diff b/libre/iceweasel/arc4random.diff new file mode 100644 index 0000000..c877d54 --- /dev/null +++ b/libre/iceweasel/arc4random.diff @@ -0,0 +1,33 @@ +diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +index 101d39d455107..3764806240f9f 100644 +--- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h ++++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +@@ -30,13 +30,13 @@ + /* #undef EVENT__HAVE_AFUNIX_H 1 */ + + /* Define to 1 if you have the `arc4random' function. */ +-/* #undef EVENT__HAVE_ARC4RANDOM */ ++#define EVENT__HAVE_ARC4RANDOM 1 + + /* Define to 1 if you have the `arc4random_addrandom' function. */ + /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */ + + /* Define to 1 if you have the `arc4random_buf' function. */ +-/* #undef EVENT__HAVE_ARC4RANDOM_BUF */ ++#define EVENT__HAVE_ARC4RANDOM_BUF 1 + + /* Define to 1 if you have the header file. */ + #define EVENT__HAVE_ARPA_INET_H 1 +diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp +index 57cf85de80b79..93a2f6e80ad0b 100644 +--- i/toolkit/crashreporter/client/ping.cpp ++++ w/toolkit/crashreporter/client/ping.cpp +@@ -53,7 +53,7 @@ static string GenerateUUID() { + + CFRelease(uuid); + #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ... +- arc4random_buf(id, sizeof(UUID)); ++ arc4random_buf(&id, sizeof(UUID)); + #else // Linux + int fd = open("/dev/urandom", O_RDONLY); + From fb5b37927be7f6e714ad1ded8f4191236860af3f Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:43 +0000 Subject: [PATCH 79/200] [iceweasel]: tweak for i686 --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index fc5381f..a08b337 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -79,6 +79,7 @@ makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) [[ "${CARCH}" == 'i686' ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin +[[ "${CARCH}" == 'i686' ]] && makedepends+=( llvm13 ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' From dbe073e0738ebff1c46759efa19ed93d9fe46bb2 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:44 +0000 Subject: [PATCH 80/200] [iceweasel]: fix 'sync' bug --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a08b337..78c2417 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -115,7 +115,7 @@ sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' - 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d') + '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in index cccb37a..1569e98 100644 --- a/libre/iceweasel/vendor.js.in +++ b/libre/iceweasel/vendor.js.in @@ -310,3 +310,6 @@ pref("extensions.getAddons.showPane", false); // Setting these preferences just in case and to not frustrate users. pref("app.normandy.api_url", "http://127.0.0.1/"); pref("app.normandy.enabled", false); + +// enable "sync" feature +pref("webchannel.allowObject.urlWhitelist", "https://content.cdn.mozilla.net https://support.mozilla.org https://install.mozilla.org https://accounts.firefox.com"); From 7df72849ff9c59ed34e1854eeac70c5c4a8f6a1c Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:45 +0000 Subject: [PATCH 81/200] [iceweasel]: upgrade to v104.0.1 --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 78c2417..b341bd3 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=104.0 +pkgver=104.0.1 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -75,6 +75,7 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb python-setuptools python-zstandard lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) +makedepends+=(python-pydantic=1.9.2) # pydantic 1.10.1 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not) [[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) @@ -103,7 +104,7 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce' +sha256sums=('f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e' 'SKIP' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4' From 6317bf7b0c5bfbcf0f4b09747a66121e9569df31 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:45 +0000 Subject: [PATCH 82/200] [iceweasel]: housekeeping --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index b341bd3..08ee3ba 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -34,7 +34,9 @@ # technical: # - build i686 with GCC instead of clang # - disable rust-SIMD, LTO, PGO, and skip profiling build for armv7h and i686 -# - allow skipping profiling build for x86_64 (_x86_64_skip_pgo) +# - allow skipping profiling build for x86_64 (_x86_64_skip_pgo). +# this is to avoid OOM problems, and occasional deadlocks in some versions, +# which expect active netwokring or internet access at build time. # - prefer as many system libs as possible, over their vendored couterparts # - Rebrand to Iceweasel, per the mozilla trademark policy, due to the FSDG changes # - set user profile directory to ~/.mozilla/iceweasel @@ -511,7 +513,7 @@ build() { export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" - # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature + # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # LTO needs more open files @@ -576,8 +578,7 @@ build() { if (( $_should_skip_pgo )) then - # skipping "3-tier PGO" "instrumented browser", to avoid OOM problems; - # so we have the final .mozconfig now + # skipping "3-tier PGO" "instrumented browser"; so the final .mozconfig is ready now cp ../mozconfig .mozconfig else # Do 3-tier PGO From f2a919cf404f3e0cba7062e385caca92d5992ed2 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:45 +0000 Subject: [PATCH 83/200] [pacman2pacman]: add CC0 license SPDX xylon agreed on the mailing list https://lists.parabola.nu/pipermail/dev/2022-September/008338.html --- diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD index 6489b3c..50ce9ac 100644 --- a/pcr/pacman2pacman/PKGBUILD +++ b/pcr/pacman2pacman/PKGBUILD @@ -1,4 +1,7 @@ -# Maintainer: Joseph Graham +# SPDX-License-Identifier: CC0-1.0 +# Maintainers: Parabola hackers +# Contributor: Joseph Graham + pkgname=pacman2pacman pkgver=20170705.1 @@ -20,7 +23,9 @@ _gitver='commit=b3e6461c5b9da4612fc87be5118b848fcc22e097' mksource=("$pkgname-$pkgver::git://git.parabola.nu/pacman2pacman.git/#$_gitver") mkmd5sums=('SKIP') -package() { + +package() +{ cd $pkgname-$pkgver mkdir -p "${pkgdir}/srv/pacman2pacman/torrents" From 4c1034a2b98ea1bf1b2f65170cf7db9e2e4cb048 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 03 2022 23:11:45 +0000 Subject: [PATCH 84/200] [COPYRIGHTS]: add recent confirmations --- diff --git a/COPYRIGHTS b/COPYRIGHTS index 8a82143..8e05a66 100644 --- a/COPYRIGHTS +++ b/COPYRIGHTS @@ -22,9 +22,12 @@ decisions. And several contributors agreed to license their past contributions to packages in this repository under the CC0 license: - Andreas Grapentin -- bill-auger +- Bill Auger - Denis 'GNUtoo' Carikli - Freemor +- Joseph Graham +- Omar Vega Ramos +- Luke Shumaker As for patches, as they are combined with original project source code they are under the same license than the original project. From d6bf3e8c6b1d032202b145364493626326f4f98c Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 04 2022 01:12:54 +0000 Subject: [PATCH 85/200] add 'package-all-acpi_call-tp_smapi' helper script --- diff --git a/scripts/package-all-acpi_call-tp_smapi b/scripts/package-all-acpi_call-tp_smapi new file mode 100755 index 0000000..45dc478 --- /dev/null +++ b/scripts/package-all-acpi_call-tp_smapi @@ -0,0 +1,29 @@ +#!/bin/bash + +# TODO: inject the appropriate values of '_basekernel' into the PKGBUILDs, +# and commit to VCS +# $ _commit_msg='[acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels' +# $ git commit -m "${_commit_msg}" "${PKGBUILDS[@]}" + + +readonly CHROOT_NAME_x86_64=x86_64 +readonly CHROOT_NAME_i686=i686 +readonly CHROOT_NAME_armv7h=armv7h +readonly ABS_ROOT=/var/lib/archbuild/packages/abslibre + + +for ar in $CHROOT_NAME_x86_64 $CHROOT_NAME_i686 $CHROOT_NAME_armv7h +do sudo librechroot $ar update +done + +for pkg_dir in $ABS_ROOT/libre/acpi_call{-dkms,,-lts}/ \ + $ABS_ROOT/libre/tp_smapi{,-lts}/ +do cd $pkg_dir + for ar in $CHROOT_NAME_x86_64 $CHROOT_NAME_i686 $CHROOT_NAME_armv7h + do sudo libremakepkg $ar || break + done +done + +echo DONE +ls $ABS_ROOT/libre/acpi_call{-dkms,,-lts}/*.pkg.tar.* \ + $ABS_ROOT/libre/tp_smapi{,-lts}/*.pkg.tar.* From 49f6ca84cead58280a4cc3cc079a9610dcbed07d Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 04 2022 01:12:54 +0000 Subject: [PATCH 86/200] [acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels --- diff --git a/libre/acpi_call-dkms/PKGBUILD b/libre/acpi_call-dkms/PKGBUILD index a539c05..bf43b4a 100644 --- a/libre/acpi_call-dkms/PKGBUILD +++ b/libre/acpi_call-dkms/PKGBUILD @@ -6,7 +6,20 @@ # Maintainer: Omar Vega Ramos -_basekernel=5.17.3 +# build order: +# acpi_call-dkms <- acpi_call-lts +# acpi_call +# linux-libre-lts-headers <- acpi_call-lts +# tp_smapi-lts +# linux-libre-headers <- acpi_call +# tp_smapi +# +# these packages may be built as a batch, with the helper script: +# 'scripts/package-all-acpi_call-tp_smapi' +# simply edit '_basekernel' in each # TODO: automate that too + + +_basekernel=5.18.14 pkgname=acpi_call-dkms _tag='9f1c0b5d046bdfdec769809435257647fd475473' # git rev-parse v${_tag_name} @@ -16,7 +29,8 @@ pkgrel+=.parabola1.basekernel${_basekernel} pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources' pkgdesc+=' (for linux-libre)' url='https://github.com/nix-community/acpi_call' -arch=('armv7h' 'i686' 'x86_64') +arch=('any') +arch=('armv7h' 'i686' 'x86_64') # just to simplify the package-all-acpi_call-tp_smapi script license=('GPL') depends=('dkms') makedepends=('git') diff --git a/libre/acpi_call-lts/PKGBUILD b/libre/acpi_call-lts/PKGBUILD index 6cc715a..8cab1e7 100644 --- a/libre/acpi_call-lts/PKGBUILD +++ b/libre/acpi_call-lts/PKGBUILD @@ -1,12 +1,25 @@ -# Maintainer (Arch): Maxime Gauduin -# Contributor (Arch): mortzu -# Contributor (Arch): fnord0 -# Contributor (Hyperbola): André Silva -# Contributor (Hyperbola): Márcio Silva +# Maintainer (arch): Maxime Gauduin +# Contributor: mortzu +# Contributor: fnord0 +# Contributor: André Silva +# Contributor: Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.10.89 +# build order: +# acpi_call-dkms <- acpi_call-lts +# acpi_call +# linux-libre-lts-headers <- acpi_call-lts +# tp_smapi-lts +# linux-libre-headers <- acpi_call +# tp_smapi +# +# these packages may be built as a batch, with the helper script: +# 'scripts/package-all-acpi_call-tp_smapi' +# simply edit '_basekernel' in each # TODO: automate that too + + +_basekernel=5.15.41 pkgname=acpi_call-lts pkgver=1.2.2 @@ -16,7 +29,7 @@ pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/ pkgdesc+=' (for linux-libre-lts)' url='https://github.com/mkottman/acpi_call' arch=('x86_64') -arch+=('i686' 'armv7h') +arch+=('armv7h' 'i686') license=('GPL') makedepends=(linux-libre-lts-headers=${_basekernel} acpi_call-dkms=$pkgver libelf) conflicts=('acpi_call-dkms') diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index ef36595..468336d 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -6,7 +6,20 @@ # Maintainer: Omar Vega Ramos -_basekernel=5.17.3 +# build order: +# acpi_call-dkms <- acpi_call-lts +# acpi_call +# linux-libre-lts-headers <- acpi_call-lts +# tp_smapi-lts +# linux-libre-headers <- acpi_call +# tp_smapi +# +# these packages may be built as a batch, with the helper script: +# 'scripts/package-all-acpi_call-tp_smapi' +# simply edit '_basekernel' in each # TODO: automate that too + + +_basekernel=5.18.14 pkgname=acpi_call pkgver=1.2.2 @@ -19,7 +32,7 @@ arch=('x86_64') arch+=('armv7h' 'i686') license=('GPL') makedepends=(linux-libre-headers=${_basekernel} "acpi_call-dkms=$pkgver") -makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel +#makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel conflicts=('acpi_call-dkms') build() { diff --git a/libre/tp_smapi-lts/PKGBUILD b/libre/tp_smapi-lts/PKGBUILD index 338c28c..08741db 100644 --- a/libre/tp_smapi-lts/PKGBUILD +++ b/libre/tp_smapi-lts/PKGBUILD @@ -1,17 +1,30 @@ -# Maintainer (Arch): Lukas Fleischer -# Contributor (Arch): xduugu -# Contributor (Arch): nh2 -# Contributor (Arch): Steven Davidovitz -# Contributor (Arch): Nick B -# Contributor (Arch): Christof Musik -# Contributor (Arch): Stefan Rupp -# Contributor (Arch): Ignas Anikevicius -# Contributor (Hyperbola): André Silva -# Contributor (Hyperbola): Márcio Silva +# Maintainer (arch): Lukas Fleischer +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz +# Contributor: Nick B +# Contributor: Christof Musik +# Contributor: Stefan Rupp +# Contributor: Ignas Anikevicius +# Contributor: André Silva +# Contributor: Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.10.89 +# build order: +# acpi_call-dkms <- acpi_call-lts +# acpi_call +# linux-libre-lts-headers <- acpi_call-lts +# tp_smapi-lts +# linux-libre-headers <- acpi_call +# tp_smapi +# +# these packages may be built as a batch, with the helper script: +# 'scripts/package-all-acpi_call-tp_smapi' +# simply edit '_basekernel' in each # TODO: automate that too + + +_basekernel=5.15.41 pkgname=tp_smapi-lts pkgver=0.43 diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index 32fd5d6..23f7463 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -1,17 +1,30 @@ -# Maintainer (Arch): Lukas Fleischer -# Contributor (Arch): xduugu -# Contributor (Arch): nh2 -# Contributor (Arch): Steven Davidovitz -# Contributor (Arch): Nick B -# Contributor (Arch): Christof Musik -# Contributor (Arch): Stefan Rupp -# Contributor (Arch): Ignas Anikevicius -# Contributor (Hyperbola): André Silva -# Contributor (Hyperbola): Márcio Silva +# Maintainer (arch): Lukas Fleischer +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz +# Contributor: Nick B +# Contributor: Christof Musik +# Contributor: Stefan Rupp +# Contributor: Ignas Anikevicius +# Contributor: André Silva +# Contributor: Márcio Silva # Maintainer: Omar Vega Ramos -_basekernel=5.15.12 +# build order: +# acpi_call-dkms <- acpi_call-lts +# acpi_call +# linux-libre-lts-headers <- acpi_call-lts +# tp_smapi-lts +# linux-libre-headers <- acpi_call +# tp_smapi +# +# these packages may be built as a batch, with the helper script: +# 'scripts/package-all-acpi_call-tp_smapi' +# simply edit '_basekernel' in each # TODO: automate that too + + +_basekernel=5.18.14 pkgname=tp_smapi pkgver=0.43 From f194f6531d6a9ddd0a0f4a2593a5a59bee0a55c5 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 05 2022 02:35:12 +0000 Subject: [PATCH 87/200] [quassel]: upgrade to v0.14.0 (FTBS) --- diff --git a/libre/quassel/0001-qtui-Set-desktop-file-name.patch b/libre/quassel/0001-qtui-Set-desktop-file-name.patch deleted file mode 100644 index 10f017e..0000000 --- a/libre/quassel/0001-qtui-Set-desktop-file-name.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Fri, 22 Mar 2019 22:37:22 +0100 -Subject: [PATCH] qtui: Set desktop file name - -The XCB platform plugin defaults the WM class to the executable name, -which already matches our desktop file name. Unfortunately, the Wayland -platform plugin prepends the inverted organization domain, resulting in -an app ID of "org.quassel-irc.quasselclient", thus breaking the -association. - -Set the desktop file name explicitly so the Wayland platform doesn't get -confused. ---- - src/qtui/monoapplication.cpp | 3 +++ - src/qtui/qtuiapplication.cpp | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp -index 809f1147..457a5dce 100644 ---- a/src/qtui/monoapplication.cpp -+++ b/src/qtui/monoapplication.cpp -@@ -32,6 +32,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv) - : QtUiApplication(argc, argv) - { - Quassel::setRunMode(Quassel::Monolithic); -+#if QT_VERSION >= 0x050700 -+ QGuiApplication::setDesktopFileName(Quassel::buildInfo().applicationName); -+#endif - } - - -diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp -index e5b0b773..42e4bf77 100644 ---- a/src/qtui/qtuiapplication.cpp -+++ b/src/qtui/qtuiapplication.cpp -@@ -92,6 +92,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) - #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) - QGuiApplication::setFallbackSessionManagementEnabled(false); - #endif -+#if QT_VERSION >= 0x050700 -+ QGuiApplication::setDesktopFileName(Quassel::buildInfo().clientApplicationName); -+#endif - } - - diff --git a/libre/quassel/0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/libre/quassel/0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 734501f..0000000 --- a/libre/quassel/0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -Add a unit test that ensures that enum serialization honors the width -of the underlying type. ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList MsgIdList; - typedef QList BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast(v); - return in; - } -+#endif - - // Exceptions - diff --git a/libre/quassel/0003-Removed-mozilla-IRC-network-from-networks.ini.patch b/libre/quassel/0003-Removed-mozilla-IRC-network-from-networks.ini.patch deleted file mode 100644 index 7a745de..0000000 --- a/libre/quassel/0003-Removed-mozilla-IRC-network-from-networks.ini.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Svetlana T -Date: Sun, 8 Mar 2020 07:46:19 +1100 -Subject: [PATCH] Removed mozilla IRC network from networks.ini - -Mozilla IRC has shut down this month. Mozilla moved their chat services to matrix. I am removing it from the default preset now. ---- - data/networks.ini | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/data/networks.ini b/data/networks.ini -index 5f8fa029..73afecb3 100644 ---- a/data/networks.ini -+++ b/data/networks.ini -@@ -35,9 +35,6 @@ Servers=irc.gamesnet.net:6667 - [IRCnet] - Servers=irc.ircnet.com:6667,open.ircnet.net:6666,irc.us.ircnet.net:6665,ircnet.netvision.net.il:6666,irc.tokyo.wide.ad.jp:6666,irc.freebsd.org.tw:6666,linz.irc.at:6666,vienna.irc.at:6666,ircnet.realroot.be:6666,irc.datacomm.ch:6664,irc.felk.cvut.cz:6667,random.ircd.de:6666,irc.dotsrc.org:6666,irc.ircnet.ee:6666,irc.cs.hut.fi:6667,ircnet.club-internet.fr:6666,atw.irc.hu:6667,irc.simnet.is:6660,irc.eutelia.it:6664,irc.eutelia.it:7000,irc.tin.it:6665,irc.apollo.lv:6666,irc.apollo.lv:7000,irc.uunet.nl:6660,irc.xs4all.nl:6660,irc.snt.utwente.nl:6660,irc.ifi.uio.no:6667,irc.pvv.ntnu.no:6667,lublin.irc.pl:6666,warszawa.irc.pl:6666,irc.ludd.luth.se:6661,irc.swipnet.se:6660,irc.swipnet.se:8000,irc.arnes.si:6666,irc.link.si:6666,irc.nextra.sk:6666,ircnet.demon.co.uk:6665,ircnet.eversible.com:6665,ircnet.choopa.net:6665 - --[Mozilla] --Servers=irc.mozilla.org:+6697,irc.mozilla.org:6667 -- - [OFTC] - Servers=irc.oftc.net:+6697,irc.oftc.net:6667 - diff --git a/libre/quassel/0004-This-commit-changes-the-official-Quassel-IRC-channel.patch b/libre/quassel/0004-This-commit-changes-the-official-Quassel-IRC-channel.patch deleted file mode 100644 index af33d51..0000000 --- a/libre/quassel/0004-This-commit-changes-the-official-Quassel-IRC-channel.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: phuzion <398094+phuzion@users.noreply.github.com> -Date: Wed, 19 May 2021 18:05:36 +0000 -Subject: [PATCH] This commit changes the official Quassel IRC channel, - (#quassel) from the Freenode IRC network to the Libera IRC network in - response to recent issues which resulted in the entire volunteer staff of - Freenode stepping down. - -For more information about this situation, please read this: -https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409 ---- - README.md | 6 ++---- - data/networks.ini | 7 +++++-- - src/qtui/aboutdlg.cpp | 2 +- - 3 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/README.md b/README.md -index c7b03dc2..6f54dfaa 100644 ---- a/README.md -+++ b/README.md -@@ -47,31 +47,29 @@ documentation. - - IRC is the preferred means of getting in touch with the developers. - --The Quassel IRC Team can be contacted on **`Freenode/#quassel`** --(or **`#quassel.de`**). If you have trouble getting Quassel to connect, --you can use [Freenode's webchat][help-freenode]. -+The Quassel IRC Team can be contacted on **`Libera Chat/#quassel`** -+(or **`#quassel.de`**). - - We always welcome new users in our channels! - - You can learn more and reach out to us in several ways: - * [Visit our homepage][web-home] - * [Submit and browse issues on the bugtracker][dev-bugs] - * GitHub issues are not used, but [pull requests][dev-pr-new] are accepted! - * [Email the dev team - devel@quassel-irc.org][dev-email] - - Thanks for reading, - - ~ *The Quassel IRC Team* - - [web-home]: https://quassel-irc.org - [web-download]: https://quassel-irc.org/downloads - [dev-bugs]: https://bugs.quassel-irc.org - [dev-email]: mailto:devel@quassel-irc.org - [dev-pr-new]: https://github.com/quassel/quassel/pull/new/master - [docs-wiki]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki - [docs-wiki-unofficial-build]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki#Unofficial-builds - [docs-wiki-getstart]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki#Getting-started --[help-freenode]: https://webchat.freenode.net?channels=%23quassel - [repo-changelog]: ChangeLog - [ci-linux-badge]: https://travis-ci.org/quassel/quassel.svg?branch=master - [ci-linux-status-page]: https://travis-ci.org/quassel/quassel/branches -diff --git a/data/networks.ini b/data/networks.ini -index 73afecb3..cf16313e 100644 ---- a/data/networks.ini -+++ b/data/networks.ini -@@ -19,22 +19,25 @@ Servers=irc.efnet.info:6667,irc.efnet.org:6667,irc.inter.net.il:6667,irc.igs.ca: - Servers=irc.enterthegame.com:6667 - - [Freenode] --Default=Yes --DefaultChannels=#quassel - Servers=chat.freenode.net:+6697,chat.freenode.net:6667 - - [GalaxyNet] - Servers=irc.galaxynet.org:6662,irc.galaxynet.org:7000,boston.ma.us.galaxynet.org:6661 - - [GameSurge] - Servers=irc.gamesurge.net:6667,irc.eu.gamesurge.net:6667 - - [GamesNET] - Servers=irc.gamesnet.net:6667 - - [IRCnet] - Servers=irc.ircnet.com:6667,open.ircnet.net:6666,irc.us.ircnet.net:6665,ircnet.netvision.net.il:6666,irc.tokyo.wide.ad.jp:6666,irc.freebsd.org.tw:6666,linz.irc.at:6666,vienna.irc.at:6666,ircnet.realroot.be:6666,irc.datacomm.ch:6664,irc.felk.cvut.cz:6667,random.ircd.de:6666,irc.dotsrc.org:6666,irc.ircnet.ee:6666,irc.cs.hut.fi:6667,ircnet.club-internet.fr:6666,atw.irc.hu:6667,irc.simnet.is:6660,irc.eutelia.it:6664,irc.eutelia.it:7000,irc.tin.it:6665,irc.apollo.lv:6666,irc.apollo.lv:7000,irc.uunet.nl:6660,irc.xs4all.nl:6660,irc.snt.utwente.nl:6660,irc.ifi.uio.no:6667,irc.pvv.ntnu.no:6667,lublin.irc.pl:6666,warszawa.irc.pl:6666,irc.ludd.luth.se:6661,irc.swipnet.se:6660,irc.swipnet.se:8000,irc.arnes.si:6666,irc.link.si:6666,irc.nextra.sk:6666,ircnet.demon.co.uk:6665,ircnet.eversible.com:6665,ircnet.choopa.net:6665 - -+[Libera Chat] -+Default=Yes -+DefaultChannels=#quassel -+Servers=irc.libera.chat:+6697,irc.libera.chat:6667 -+ - [OFTC] - Servers=irc.oftc.net:+6697,irc.oftc.net:6667 - -diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp -index 6b21b0f5..a6c4da25 100644 ---- a/src/qtui/aboutdlg.cpp -+++ b/src/qtui/aboutdlg.cpp -@@ -67,7 +67,7 @@ QString AboutDlg::about() const - QString res {tr("A modern, distributed IRC Client

" - "©%1 by the Quassel Project
" - "https://quassel-irc.org
" -- "#quassel on Freenode

" -+ "#quassel on Libera Chat

" - "Quassel IRC is dual-licensed under GPLv2 and " - "GPLv3.
" - "Breeze icon theme © Uri Herrera and others, licensed under the " diff --git a/libre/quassel/9000-search-duck.patch b/libre/quassel/9000-search-duck.patch index 9fc77b7..7252f55 100644 --- a/libre/quassel/9000-search-duck.patch +++ b/libre/quassel/9000-search-duck.patch @@ -7,7 +7,7 @@ index 838891b..4d28926 100644 inline void enableSenderBrackets(bool enabled) { setLocalValue("ShowSenderBrackets", enabled); } - inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://www.google.com/search?q=%s").toString(); } -+ inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://duckduckgo.com/?q=%s").toString(); } ++ inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://html.duckduckgo.com/html/?q=%s").toString(); } inline void setWebSearchUrlFormatString(const QString &format) { setLocalValue("WebSearchUrlFormat", format); } }; @@ -20,7 +20,7 @@ index 99f568a..7d13fff 100644 - https://www.google.com/search?q=%s -+ https://duckduckgo.com/?q=%s ++ https://html.duckduckgo.com/html/?q=%s diff --git a/libre/quassel/PKGBUILD b/libre/quassel/PKGBUILD index 013ca72..7c85913 100644 --- a/libre/quassel/PKGBUILD +++ b/libre/quassel/PKGBUILD @@ -1,11 +1,13 @@ # Maintainer (arch): Jaroslav Lichtblau # Contributor: Vesa Kaihlavirta # Maintainer: bill-auger +# Contributer: Wael Karram # parabola changes and rationale: # - repalce qt5-webengine with qt5-webkit (for URL previews) # - set duckduckgo as default search engine +# - pin to strongly-coupled dependencies pkgbase=quassel @@ -15,57 +17,46 @@ pkgname=('quassel-core' 'quassel-monolithic' 'quassel-monolithic-qt' 'quassel-common') -pkgver=0.13.1 -pkgrel=9 +pkgver=0.14.0 +pkgrel=2 pkgrel+=.parabola1 pkgdesc="Next-generation distributed IRC client" arch=('x86_64') arch+=('armv7h' 'i686') url="https://quassel-irc.org/" license=('GPL') -makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca' 'qt5-script' +makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca' 'qt5-multimedia' 'knotifyconfig' 'sonnet' 'libldap' 'cmake' - 'extra-cmake-modules' 'python' 'hicolor-icon-theme') -makedepends=(${makedepends[*]/qt5-webengine/qt5-webkit}) + 'extra-cmake-modules' 'python' 'hicolor-icon-theme' 'boost') +makedepends=( ${makedepends[*]/qt5-webengine/qt5-webkit} ) source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 - 0001-qtui-Set-desktop-file-name.patch - 0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - 0003-Removed-mozilla-IRC-network-from-networks.ini.patch - 0004-This-commit-changes-the-official-Quassel-IRC-channel.patch $pkgbase.service $pkgbase.sysusers $pkgbase.tmpfiles $pkgbase.conf) source+=(9000-search-duck.patch) -sha256sums=('48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855' - '7a64214024dc047f35ec8af3c5d543853a5c89c0506766c69c2e1072ca8f5ec7' - 'a1f874558f31c786b2fb483454d14e74a0dfc01382e1ba58bd610a65e02f4df4' - '0f92f3a51d2e3272d71b21a563047d7fae93bc2dd6676f405a2d63a20d48521b' - 'f59d4138f5fc8c9e84b5626fcbe16eec21b22344dc6c28d784c511677de661e1' +sha256sums=('bbd46ca429c1518480904c9e2b0ab3a0412fe197f3ce4879974e06ed3a0093a3' '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' '3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9' '2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') -sha256sums+=('3d90a7edfa2b2e27e5f56b25f7583585efbcd35219c04a3bf138d9fe9bb9eab2') +sha256sums+=('e1dcb63b3b4e85b3c70d2a1788dd20271608dfe715bf23487f7b492989b2b3ec') prepare() { cd $pkgbase-$pkgver - patch -Np1 -i ../0001-qtui-Set-desktop-file-name.patch - patch -Np1 -i ../0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - patch -Np1 -i ../0003-Removed-mozilla-IRC-network-from-networks.ini.patch - patch -Np1 -i ../0004-This-commit-changes-the-official-Quassel-IRC-channel.patch # parabola patches + echo "applying 9000-search-duck.patch" patch -Np1 -i ../9000-search-duck.patch } _build() ( cmake -H$pkgbase-$pkgver -Bbuild-$1 \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ + -DENABLE_SHARED=OFF \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-suggest-override" \ - -DHAVE_SSL=ON \ "${@:2}" \ -Wno-dev cmake --build build-$1 @@ -118,7 +109,7 @@ build() { package_quassel-core() { pkgdesc="Next-generation distributed IRC client - core only" -depends=('icu' 'qca' 'qt5-script' 'libldap') +depends=('icu' 'qca' 'libldap') depends+=(libicuuc.so libicudata.so) # via 'qt5-base' -> libQt5Core.so.N -> libicuuc.so.M -> libicudata.so.M optdepends=('postgresql: PostgreSQL database support') backup=(etc/conf.d/quassel) @@ -141,8 +132,7 @@ backup=(etc/conf.d/quassel) package_quassel-client() { pkgdesc="Next-generation distributed IRC client - client only, KDE version" depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig') -pkgdesc+=" with webkit HTML rendering" -depends=(${depends[*]/qt5-webengine/qt5-webkit}) +depends=( ${depends[*]/qt5-webengine/qt5-webkit} ) optdepends=('perl: for builtin /exec scripts') conflicts=('quassel-client-qt') @@ -150,7 +140,7 @@ conflicts=('quassel-client-qt') install -Dm644 $pkgbase-$pkgver/data/quasselclient.appdata.xml "$pkgdir/usr/share/metainfo/quasselclient.appdata.xml" # Split quassel-common - rm -r "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel} + rm -r "$pkgdir"/usr/share/{icons,knotifications5,quassel} } package_quassel-client-qt() { @@ -163,7 +153,7 @@ replaces=('quassel-client-small' 'quassel-remote') _install client-qt # Split quassel-common - rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel} + rm -r "$pkgdir"/usr/share/{icons,quassel} # Ignore package by AppStream to avoid duplicated IDs echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quasselclient.desktop" @@ -171,10 +161,9 @@ replaces=('quassel-client-small' 'quassel-remote') package_quassel-monolithic() { pkgdesc="Next-generation distributed IRC client - monolithic, KDE version" -depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca' +depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qca' 'knotifyconfig' 'libldap') -pkgdesc+=" with webkit HTML rendering" -depends=(${depends[*]/qt5-webengine/qt5-webkit}) +depends=( ${depends[*]/qt5-webengine/qt5-webkit} ) optdepends=('perl: for builtin /exec scripts' 'postgresql: PostgreSQL database support') conflicts=('quassel-monolithic-qt') @@ -184,13 +173,13 @@ conflicts=('quassel-monolithic-qt') # Split quassel-common mkdir "$srcdir/quassel-common" - mv "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel} \ + mv "$pkgdir"/usr/share/{icons,knotifications5,quassel} \ "$srcdir/quassel-common/" } package_quassel-monolithic-qt() { pkgdesc="Next-generation distributed IRC client - monolithic, Qt version with reduced deps" -depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'qt5-script' 'sonnet') +depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'sonnet') optdepends=('perl: for builtin /exec scripts' 'postgresql: PostgreSQL database support') conflicts=('quassel-monolithic') @@ -198,7 +187,7 @@ conflicts=('quassel-monolithic') _install monolithic-qt # Split quassel-common - rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel} + rm -r "$pkgdir"/usr/share/{icons,quassel} # Ignore package by AppStream to avoid duplicated IDs echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quassel.desktop" From bdaf06dab8be8724c2fcab100970cb74d3d364c3 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Sep 05 2022 02:35:13 +0000 Subject: [PATCH 88/200] [quassel]: upgrade to v0.14.0-2 --- diff --git a/libre/quassel/9000-search-duck.patch b/libre/quassel/9000-search-duck.patch index 7252f55..33224a3 100644 --- a/libre/quassel/9000-search-duck.patch +++ b/libre/quassel/9000-search-duck.patch @@ -1,15 +1,19 @@ -diff --git a/src/qtui/chatviewsettings.h b/src/qtui/chatviewsettings.h -index 838891b..4d28926 100644 ---- a/src/qtui/chatviewsettings.h -+++ b/src/qtui/chatviewsettings.h -@@ -104,7 +104,7 @@ public: - */ - inline void enableSenderBrackets(bool enabled) { setLocalValue("ShowSenderBrackets", enabled); } +diff --git a/src/qtui/chatviewsettings.cpp b/src/qtui/chatviewsettings.cpp +index 51435018..e4dbe734 100644 +--- a/src/qtui/chatviewsettings.cpp ++++ b/src/qtui/chatviewsettings.cpp +@@ -90,7 +90,7 @@ void ChatViewSettings::enableSenderBrackets(bool enabled) + + QString ChatViewSettings::webSearchUrlFormatString() const + { +- return localValue("WebSearchUrlFormat", "https://www.google.com/search?q=%s").toString(); ++ return localValue("WebSearchUrlFormat", "https://html.duckduckgo.com/html/?q=%s").toString(); + } + + void ChatViewSettings::setWebSearchUrlFormatString(const QString& format) +-- +2.37.3 -- inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://www.google.com/search?q=%s").toString(); } -+ inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://html.duckduckgo.com/html/?q=%s").toString(); } - inline void setWebSearchUrlFormatString(const QString &format) { setLocalValue("WebSearchUrlFormat", format); } - }; diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui index 99f568a..7d13fff 100644 From 0cae687ea6c7a490a2bbd7e2f94bbedd7fb9fd4b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 05 2022 02:35:13 +0000 Subject: [PATCH 89/200] [quaternion]: add package --- diff --git a/pcr/quaternion/PKGBUILD b/pcr/quaternion/PKGBUILD new file mode 100644 index 0000000..bef6c1b --- /dev/null +++ b/pcr/quaternion/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (aur): Alexey Andreyev +# Contributor: Aleksandar Trifunović +# Contributor: Ivan Semkin +# Contributor: Martin Weinelt + + +pkgname=quaternion +pkgver=0.0.95.1 +pkgrel=1 +pkgdesc="Qt5 Matrix client, with IRC/hexchat-like GUI" +url=https://matrix.org/docs/projects/client/quaternion.html +arch=(aarch64 armv7h i686 x86_64) +license=(GPL3) + +depends=(qt5-tools qt5-multimedia qt5-quickcontrols qt5-quickcontrols2 libquotient) +optdepends=(qtkeychain) +makedepends=(cmake) + +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/quotient-im/${pkgname^}/archive/refs/tags/${pkgver}.tar.gz) +sha512sums=('465e49b90fef88b252f26b5791c2d491bfa451dd3b876b1fce8732bf96276437343fd368d1d48d20a2b5ec993a3e0a36709232f60fadd176548a7b942b22b678') + + +build() +{ + cd "${pkgname^}-${pkgver}" + + cmake -H. -Bbuild \ + -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + -DUSE_INTREE_LIBQMC=OFF + + cmake --build build +} + +package() +{ + cd "${pkgname^}-${pkgver}" + + cmake --build build -- DESTDIR="${pkgdir}/" install +} From 9faab9342930d5e84b6477d83c8746d1f84328ef Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 11 2022 19:18:02 +0000 Subject: [PATCH 90/200] housekeeping - silence noisy PKGBUILDs when sourced --- diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index fbfa02b..128bc5a 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -31,8 +31,8 @@ source=(brand.dtd sha512sums.${CARCH}) # load languages list and .xpi checksums -source languages.${CARCH} # sets $_languages -source sha512sums.${CARCH} # sets $_sha512sums +source languages.${CARCH} &> /dev/null # sets $_languages +source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums # compile package names and .xpi sources _src_url=https://ftp.mozilla.org/pub/seamonkey/releases/${pkgver}/langpack diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index 1688f31..fc8fb0b 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -35,8 +35,8 @@ source=(region.properties sha512sums.${CARCH}) # load languages list and .xpi checksums -source languages.${CARCH} # sets $_languages -source sha512sums.${CARCH} # sets $_sha512sums +source languages.${CARCH} &> /dev/null # sets $_languages +source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums # compile package names and .xpi sources #_src_url=http://ftp.gnu.org/gnu/gnuzilla/${pkgver%_*}/langpacks # FIXME: normal releases - gnuzilla lang-packs diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 05c975d..a19a590 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -42,8 +42,8 @@ source=(brand.dtd sha512sums.${CARCH}) # load languages list and .xpi checksums -source languages.${CARCH} # sets $_languages -source sha512sums.${CARCH} # sets $_sha512sums +source languages.${CARCH} &> /dev/null # sets $_languages +source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums # compile package names and .xpi sources # NOTE: there is currently no localization for Iceowl: diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 8370d63..2c384f0 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -43,8 +43,8 @@ source=(brand.dtd sha512sums.${CARCH}) # load languages list and .xpi checksums -source languages.${CARCH} # sets $_languages -source sha512sums.${CARCH} # sets $_sha512sums +source languages.${CARCH} &> /dev/null # sets $_languages +source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums # compile package names and .xpi sources _src_url=https://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-x86_64/xpi diff --git a/pcr/samhain/PKGBUILD b/pcr/samhain/PKGBUILD index 849c6af..782926a 100644 --- a/pcr/samhain/PKGBUILD +++ b/pcr/samhain/PKGBUILD @@ -22,8 +22,8 @@ sha512sums=('aaa4c9e384715fffaa55d3d5838bf137f199bd7a8da2f2005e165ead03f82c401de # Hack to allow having samhain-$pkgver.tar.gz in source=(), # since it is inside samhain_signed-$pkgver.tar.gz -[ -e ${pkgbase}_signed-$pkgver.tar.gz ] || curl -fLC - --retry 3 --retry-delay 3 -O ${source[0]} -[[ -e samhain-$pkgver.tar.gz{,.asc} ]] || tar -zxf ${pkgbase}_signed-$pkgver.tar.gz && +[ -e ${pkgbase}_signed-$pkgver.tar.gz ] || curl -fLC - --retry 3 --retry-delay 3 --silent -O ${source[0]} +[[ -e samhain-$pkgver.tar.gz{,.asc} ]] || tar -zxf ${pkgbase}_signed-$pkgver.tar.gz &> /dev/null && source+=("samhain-$pkgver.tar.gz"{,.asc}) build() { From 0e5afe0ab5a8368054c65c154c75fdcbef8d544b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 11 2022 19:18:14 +0000 Subject: [PATCH 91/200] [qutebrowser]: rebuild against latest qt5-base --- diff --git a/libre/qutebrowser/PKGBUILD b/libre/qutebrowser/PKGBUILD index af5e6cd..f12917c 100644 --- a/libre/qutebrowser/PKGBUILD +++ b/libre/qutebrowser/PKGBUILD @@ -12,6 +12,7 @@ # - set webkit backend as default # - condensed the excessive webkit rant on the welcome screen # - pin to strongly-coupled dependency versions +# - freeze at v2.5.0 # NOTE: according to the release notes, v2.5.0 is the final release to support webkit # options: # * recover webkit support --> may be difficult to maintain @@ -22,7 +23,7 @@ pkgname=qutebrowser pkgver=2.5.0 pkgrel=1 -pkgrel+=.parabola3 +pkgrel+=.parabola4 pkgdesc="A keyboard-driven, vim-like browser based on PyQt5" pkgdesc+=" and QtWebKit" arch=('armv7h' 'i686' 'x86_64') # per arch version constraints From fbed5826e5d1064008ca607083b9cbb61ff7d1a4 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 11 2022 19:18:15 +0000 Subject: [PATCH 92/200] [qt5-styleplugins]: rebuild against latest qt5-base --- diff --git a/libre/qt5-styleplugins/PKGBUILD b/libre/qt5-styleplugins/PKGBUILD index c1870e7..edbf322 100644 --- a/libre/qt5-styleplugins/PKGBUILD +++ b/libre/qt5-styleplugins/PKGBUILD @@ -3,16 +3,20 @@ # parabola changes and rationale: -# - no libre changes -# - in libre because it is a dependency of 'parabola-laf' +# - pin to strongly-coupled dependency versions +# - do not install pacman hook (the version constraints handle that better) +# - no libre changes +# - in libre because it is a dependency of 'parabola-laf' pkgname=qt5-styleplugins pkgver=5.0.0.20170311 -_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 # unreleased master branch tip +# $_commit is the unreleased VCS tip from 2017 +_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 pkgdesc='Additional style plugins for Qt5' -pkgrel=36 -arch=(armv7h i686 x86_64) +pkgrel=37 +arch=('x86_64' 'aarch64') +arch+=('armv7h' 'i686') url="https://github.com/qt/qtstyleplugins" license=('LGPL') depends=('qt5-base' 'gtk2') @@ -20,12 +24,12 @@ source=( "${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz" "0001-fix-build-against-Qt-5.15.patch" "0002-fix-gtk2-background.patch" + "${pkgname}.hook" ) -sha512sums=( - 'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d' - 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce' - 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382' -) +sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d' + 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce' + 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382' + '5f976142d27eabacd1e1050bb39801d2e4cd68ec7459662e0352541d42d6a75740d3238b5120fb47641a125d6e3200f3a39c304497ac603457e3a97e641dabc2') _version_constraint() # (dep_pkgname [precision]) diff --git a/libre/qt5-styleplugins/qt5-styleplugins.hook b/libre/qt5-styleplugins/qt5-styleplugins.hook new file mode 100644 index 0000000..33abdcf --- /dev/null +++ b/libre/qt5-styleplugins/qt5-styleplugins.hook @@ -0,0 +1,9 @@ +[Trigger] +Type = Package +Operation = Upgrade +Target = qt5-base + +[Action] +Description = Qt5 Upgrade Warning +When = PostTransaction +Exec = /usr/bin/echo "[WARNING] qt5-base was updated, qt5 applications will break until qt5-styleplugins is rebuilt." From b85259765923b25781134171e3b73da802054908 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 11 2022 19:18:16 +0000 Subject: [PATCH 93/200] [qt5-styleplugins]: tweak for arm --- diff --git a/libre/qt5-styleplugins/PKGBUILD b/libre/qt5-styleplugins/PKGBUILD index edbf322..42e24b0 100644 --- a/libre/qt5-styleplugins/PKGBUILD +++ b/libre/qt5-styleplugins/PKGBUILD @@ -80,8 +80,13 @@ build() { qmake PREFIX='/usr' \ CONFIG+='nostrip' \ QMAKE_CFLAGS_RELEASE="$CFLAGS" \ - QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" + QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \ + qtstyleplugins.pro # required for armv7h make + +# NOTE: armv7h FTBS +# Project ERROR: No module claims plugin type 'platformthemes' +# Project ERROR: No module claims plugin type 'styles' } package() { From 1e3d1deb026fb19a51ecf80ebd4f38259b55a8d9 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 12 2022 05:41:33 +0000 Subject: [PATCH 94/200] [COPYRIGHTS]: add recent confirmations --- diff --git a/COPYRIGHTS b/COPYRIGHTS index 8e05a66..1686c51 100644 --- a/COPYRIGHTS +++ b/COPYRIGHTS @@ -28,6 +28,7 @@ packages in this repository under the CC0 license: - Joseph Graham - Omar Vega Ramos - Luke Shumaker +- David Pizarro As for patches, as they are combined with original project source code they are under the same license than the original project. From 0cdbb4757f9031607902ebf11706b027ff1b9284 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 12 2022 05:47:27 +0000 Subject: [PATCH 95/200] [COPYRIGHTS]: re-word, specify upstream designations and hackers IDs --- diff --git a/COPYRIGHTS b/COPYRIGHTS index 1686c51..e7d0340 100644 --- a/COPYRIGHTS +++ b/COPYRIGHTS @@ -1,37 +1,45 @@ -Many packages (PKGBUILDs and associated files) comes from one of these -projects: -- Arch Linux -- Arch Linux ARM -- Arch Linux 32 -- Aur (Arch User repository) +Many PKGBUILDs and associated files were originally imported +from other projects, such as: -They typically come without a license, so while most of them seem to -be uncopyrightable due to their extreme simplicity and standardness, +--------------------------------------------------------------- +| Project | "Maintainer (upstream):" identifier | +|-------------------------------------------------------------| +| Archlinux | (arch) | +| Archlinux32 | (arch32) | +| ArchlinuxARM | (archarm) | +| Artix | (artix) | +| Arch User repository | (aur) | +| Gentoo | n/a | +| Hyperbola | (hyperbola) | +--------------------------------------------------------------- + +These typically come without a license, so while most of them seem to +be uncopyrightable, due to their extreme simplicity and standardness, this still creates some legal uncertaincy about their licensing. -Some packages also come from Hyperbola, and here there is also some -uncertaincy as the project added a CC0 license in its git repository -without adding any clear statement associated with it. We still need -to contact them to get more clarification on their packages licenses -for new contributions. +Several PKGBUILDs and associated files in this repository were +created from scratch for the Parabola GNU/Linux-libre project, +so they don't depend on other projects licensing decisions. -Several packages (and associated files) in this repository were -created from scratch, so they don't depend on other projects licensing -decisions. +Several contributors have agreed to license their past contributions +to this repository, under the CC0 license: -And several contributors agreed to license their past contributions to -packages in this repository under the CC0 license: -- Andreas Grapentin -- Bill Auger -- Denis 'GNUtoo' Carikli -- Freemor -- Joseph Graham -- Omar Vega Ramos -- Luke Shumaker -- David Pizarro +-------------------------------------- +| Name | Hacker ID | +|------------------------------------| +| Andreas Grapentin | (oaken-source) | +| Bill Auger | (bill-auger) | +| Denis Carikli | (gnutoo) | +| Freemor | (freemor) | +| Joseph Graham | (xylon) | +| Omar Vega Ramos | (ovruni) | +| Luke Shumaker | (lukeshu) | +| David Pizarro | (megver83) | +-------------------------------------- -As for patches, as they are combined with original project source code -they are under the same license than the original project. +As for patches, as they are combined with, or otherwise contributed to, +upstream project source code, they are taken under the same license +as the original project, per the inbound<->outbound convention. -All contributions to packages in this repository must be offered under -the CC0 license. +All contributions to this repository, from Parabola team members and users, +must be offered under the CC0 license. From 72c1eb214d94bfed8a3f6a4ba70b137e7fcfd2d4 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 12 2022 05:56:38 +0000 Subject: [PATCH 96/200] [unifont]: add package --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD new file mode 100644 index 0000000..243fb9c --- /dev/null +++ b/pcr/unifont/PKGBUILD @@ -0,0 +1,159 @@ +# Maintainer: Wael Karram +# Maintainer (aur): neeshy +# Contributor: Carlos Aznarán +# Contributor: Martin C. Doege +# Contributor: Gregory G Danielson III +# Contributor: nl6720 +# Contributor: David McInnis +# Contributor: megadriver +# Contributor: Antonio Rojas +# Contributor: Ronald van Haren +# Contributor: felix <`base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg`> + + +# parabola changes and rationale: +# - install documentation +# - combination of several AUR packages + +# NOTE: This package should be built per-arch. +# The fonts are for 'any' arch; but 'unifont-utils' has binary executables. +# NOTE: In order to publish all of these packages, `librestage` must be run twice. +# The first run will stage the 'any' packages. +# In order to librestage the per-arch 'unifont-utils' packages, +# uncomment the commented arch=() array temporarily. + + +pkgname=('pcf-unifont' + 'psf-unifont' + 'hex-unifont' + 'bdf-unifont' + 'ttf-unifont' + 'otf-unifont' + 'unifont-utils') +pkgbase=unifont +pkgver=14.0.04 +pkgrel=1 +pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)" +arch=('any') +# arch=('armv7h' 'i686' 'x86_64') +url="http://unifoundry.com/" +license=('GPL' 'custom:OFL') +# source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig}) +source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz") +sha256sums=('1f5e517ccf4cb3a09cffe31ac52de70d8f076fe024a4a2453e07db57bb64febb' +# 'SKIP') + ) +validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make +} + +package_pcf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PCF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_psf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PSF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_hex-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (hex version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_bdf-unifont () { + pkgdesc="A free bitmap font with wide Unicode support (BDF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + gzip -d --force "unifont-$pkgver.bdf.gz" + install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_ttf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (TTF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -d "$pkgdir/usr/share/fonts/Unifont/" + install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf" + install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf" + install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf" + install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_otf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (OTF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -d "$pkgdir/usr/share/fonts/Unifont/" + install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf" + install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf" + install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf" + install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_unifont-utils() { + pkgdesc="A free bitmap font with wide Unicode support - utilities" + arch=('armv7h' 'i686' 'x86_64') + license=('GPL') + depends=('perl') + optdepends=( + 'perl-wx: for the unifont-viewer utility' + 'perl-gd: for the unihex2png and unipng2hex utilities' + ) + + cd "$srcdir/unifont-$pkgver" + make -C src install PREFIX="$pkgdir/usr" LOCALBINDIR=../bin + make -C man install PREFIX="$pkgdir/usr" COMPRESS=1 +} From a0ec8e08fe9774eda46da24de67855fcfa675ec4 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 14 2022 02:20:38 +0000 Subject: [PATCH 97/200] [fonts-meta]: add bdf-unifont hex-unifont otf-unifont pcf-unifont psf-unifont ttf-unifont --- diff --git a/pcr/fonts-meta/PKGBUILD b/pcr/fonts-meta/PKGBUILD index 684789c..41c1b16 100644 --- a/pcr/fonts-meta/PKGBUILD +++ b/pcr/fonts-meta/PKGBUILD @@ -18,11 +18,13 @@ depends=( adobe-source-code-pro-fonts adobe-source-sans-pro-fonts adobe-source-serif-pro-fonts + bdf-unifont cantarell-fonts dina-font gentium-plus-font gnu-free-fonts gsfonts + hex-unifont inter-font noto-fonts-cjk noto-fonts-emoji @@ -42,7 +44,10 @@ depends=( otf-league-gothic otf-overpass otf-stix + otf-unifont + pcf-unifont powerline-fonts + psf-unifont tamsyn-font terminus-font tex-gyre-fonts @@ -90,6 +95,7 @@ depends=( ttf-sarasa-gothic ttf-sazanami ttf-tibetan-machine + ttf-unifont woff2-fira-code woff-fira-code wqy-bitmapfont From 744da1abde8af9c0ec1c662df029aca07e273c20 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 14 2022 02:20:48 +0000 Subject: [PATCH 98/200] [freecad]: add blacklist replacement --- diff --git a/libre/freecad/PKGBUILD b/libre/freecad/PKGBUILD new file mode 100644 index 0000000..a82b7b9 --- /dev/null +++ b/libre/freecad/PKGBUILD @@ -0,0 +1,91 @@ +# Maintainer (arch): Alexander F. Rødseth +# Contributor: loqs +# Contributor: Gabriel Souza Franco +# Contributor: Florian Pritz +# Contributor: Jonas Heinrich +# Contributor: Jordi De Groof +# Contributor: mickele +# Contributor: manwithgrenade +# Contributor: bricem13 +# Contributor: gborzi +# Contributor: Adrian Insaurralde + + +# parabola changes and rationale: +# - build without webengine +# - disable downloader +# - build from versioned source-ball, not VCS + +# FIXME: this package fails to build with libretools, without the -N flag +# -> could NOT find MPI (missing: MPI_C_FOUND MPI_CXX_FOUND) + + +pkgname=freecad +pkgver=0.20.1 +pkgrel=5 +pkgrel+=.parabola1 +pkgdesc='Feature based parametric 3D CAD modeler' +arch=(x86_64) +arch+=(armv7h i686) +arch=( ${arch[*]/i686/} ) # FTBS on i686 - 'med-openmpi' is unavailable +url='https://freecadweb.org/' +license=(LGPL) +depends=(boost-libs fmt glew jsoncpp libspnav med-openmpi netcdf opencascade + openmpi pyside2 pyside2-tools python-gitpython python-markdown + python-matplotlib python-pivy python-ply python-pyqt5-webengine pugixml + qt5-svg qt5-tools qt5-webkit qt5-x11extras qt5-xmlpatterns xerces-c) +depends=( ${depends[*]/python-markdown/} ) +depends=( ${depends[*]/python-pyqt5-webengine/} ) +makedepends=(boost cgns cli11 cmake coin eigen gcc-fortran git jdk-openjdk + libharu liblas ninja openmpi openvdb openvr ospray pdal postgresql-libs + python-mpi4py python-shiboken2 shiboken2 swig utf8cpp) +makedepends=( ${makedepends[*]/git/} ) # build from source-ball +makedepends=( ${makedepends[*]/openmpi/} ) # duplicate entry +[[ "${CARCH}" == x86_64 ]] || makedepends=( ${makedepends[*]/ospray/} ) # unavailable for i686 and armv7h +optdepends=('graphviz: dependency graph support' + 'openscad: OpenSCAD support') +_upstream_name=FreeCAD +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/${_upstream_name}/${_upstream_name}/archive/refs/tags/${pkgver}.tar.gz) +sha256sums=(70c15f7c1c676e3376cdc2a66c136030c5502f9802935e5b626ca8ce3f8812ed) + + +build() { + cmake \ + -B build \ + -D BUILD_ENABLE_CXX_STD=C++17 \ + -D BUILD_FLAT_MESH=ON \ + -D BUILD_QT5=ON \ + -D BUILD_ADDONMGR=OFF \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \ + -D CMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \ + -D CMAKE_INSTALL_BINDIR=/usr/lib/freecad/bin \ + -D CMAKE_INSTALL_DATADIR=/usr/share/freecad \ + -D CMAKE_INSTALL_DATAROOTDIR=/usr/share \ + -D CMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \ + -D CMAKE_INSTALL_LIBDIR=/usr/lib/freecad/lib \ + -D CMAKE_INSTALL_PREFIX=/usr/lib/freecad \ + -D FREECAD_USE_EXTERNAL_PIVY=ON \ + -D FREECAD_USE_OCC_VARIANT='Official Version' \ + -D FREECAD_USE_QT_FILEDIALOG=ON \ + -D PYTHON_EXECUTABLE=/usr/bin/python \ + -D INSTALL_TO_SITEPACKAGES=ON \ + -G Ninja \ + -S ${_upstream_name}-${pkgver} + ninja -C build +} + +package() { + DESTDIR="$pkgdir" ninja -C build install + + cd "${srcdir}"/${_upstream_name}-${pkgver} + + # thumbnailer + install -Dm755 src/Tools/$pkgname-thumbnailer -t "$pkgdir/usr/bin/" + # symlinks + install -d "$pkgdir/usr/bin" + ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/freecad" + ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/FreeCAD" + ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/freecadcmd" + ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/FreeCADCmd" +} From 94240541ad92ea867d263e64c171d9b092790205 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 14 2022 02:20:54 +0000 Subject: [PATCH 99/200] [kinfocenter]: add blacklist replacement --- diff --git a/libre/kinfocenter/PKGBUILD b/libre/kinfocenter/PKGBUILD new file mode 100644 index 0000000..5ea4599 --- /dev/null +++ b/libre/kinfocenter/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Felix Yan +# Maintainer: Antonio Rojas +# Contributor: Andrea Scarpino + +pkgname=kinfocenter +pkgver=5.25.4 +pkgrel=1 +pkgrel+=.parabola1 +pkgdesc='A utility that provides information about a computer system' +arch=(x86_64) +arch+=(armv7h i686) +url='https://kde.org/plasma-desktop/' +license=(LGPL) +depends=(systemsettings glu vulkan-tools wayland-utils xorg-xdpyinfo mesa-utils fwupd aha dmidecode) +depends=( ${depends[*]/fwupd/} ) +makedepends=(extra-cmake-modules plasma-framework kdoctools) +groups=(plasma) +source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('a2ad2f4f841d14ae2ed03bd4798ed10f08388337a5f08367248f3ef8b0ee425b' + 'SKIP') +validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan Esk-Riddell + '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson + '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin +options=(debug) + +build() { + cmake -B build -S $pkgname-$pkgver \ + -DBUILD_TESTING=OFF + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} diff --git a/libre/kinfocenter/keys/pgp/0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D.asc b/libre/kinfocenter/keys/pgp/0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D.asc new file mode 100644 index 0000000..229544e --- /dev/null +++ b/libre/kinfocenter/keys/pgp/0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D.asc @@ -0,0 +1,75 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFaTa+4BCACxyJ3oTNhz5oJOCu70mrxFqj/uqDfNm2K8Prr0CQ2I7yXijfTZ +GVIjURIzp+Zhmc1LhZYlNwwI9ivFFvLoS9kH2rkx9EaIuP3ljtxQskRFrX4BepR9 +/EvIoi7tUuOEqCy2pRy/y7Rc7s3Qbu/sPQ17wvRQqzTKsvoh9wxat6990l1MFjlF +/xBOD4Qb9LJGzc6Y8SLEEs7l/vAesL0viOME1hVQk+fG0KFosI32aeNnnLHPZbLi +Z2YETvI5nROMhleSDusqUpVxXzkIBcVLbCyeJooRsZAhJ6AB8qvhOXx2xTBBgMpw +aE/DHF6ZkvmsVB6lRNqMLjGeLOkmqx1vjZynABEBAAG0IEJodXNoYW4gU2hhaCA8 +Ymh1c2g5NEBnbWFpbC5jb20+iQE3BBMBCAAhBQJWk2vuAhsDBQsJCAcCBhUICQoL +AgQWAgMBAh4BAheAAAoJEP4HhBF/vOEdwkIIAJkj1i/lgYs4+ViHEmdjsdYwjZwn +Ge9yvOLO2UnfN5qun4IuDuPyaqGQjAlNmMzLqOwrP4dVD15AEYH/2zxYu1yrxMrU +HdJTklErm59u3nXq131LoVKORTZ3osmAV/UYtUYzj7+aBN3JmFjN+F75fzurnESd +vLPGfRrlhujQoW2x3ZAyIbpQs1lojLSEFxu8xlkXY3KkSLRlUoxGgnclhC+ov/+Z +9E4jPjz4nZhTuAOem5Swh6yHujD1v3wIlgc1qU8U1KZ+ulwtwDAVnS0/+WQjXmta +l2PiP0wcCIgZdZihTdY/eOY9tepp19SBwUkdNcqzMbAZyfh8d4t9jsYRH460IkJo +dXNoYW4gU2hhaCAoa2RlKSA8YnNoYWhAa2RlLm9yZz6JATcEEwEIACEFAld3rtIC +GwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ/geEEX+84R1tfwf9GSACMGPF +i9AArBwFhaYUKB4BJqNgCSRvQJ7gtG6YAaW+o919AtmpO+nq0JtvrSXQVLbJ1jxE +MXsNJnvZByiACm91u8z/LzMoI5C6RK13eGTTBr57LAE8lXI0xhkiSwQUAPQWJXum +E1evoHExHrAi+z6aLa6QXwyqmP5amwked6S6R9GxGI2c+UPm9sVh4Lb1L/pEzeCd +t7/1R1baAQ+weI1cVbfd4b9Qc5r/baq41CesZKz29UgorqiLyBXlWLUCClAXB/nr +bAh7hR4pDhSsIExSTp8gBnBTpKc2NAzGZTxopcvi/SOAxkdFlfkBewXuvHOxg0S8 +s8z7Owaeckbj7bQyQmh1c2hhbiBTaGFoIChteWtvbGFiIGFkZHJlc3MpIDxic2hh +aEBteWtvbGFiLmNvbT6JAU4EEwEIADgWIQQKrHdbtkN6jZr3o6z+B4QRf7zhHQUC +W4T3zwIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRD+B4QRf7zhHa3OB/0Q +BQ8tc6WukC9ubRd5A1vEe5tSWvzJEB25mc+YfXj3eha9ZhGWSNF7iHQ278aKgyn4 +HS/Mve+A+w7ZQWtGK1sjxC1E7qn1U1Xx5BoadbvEfN8E9Vun0NPLa/FXtz6gTnGP +OkgJ6NjQuEy6aKT9lGbHuxXBLPfGfEQrT16ny0+Nc3Is1cSIWsmyF59vZTH9Z8uJ +u2C04lyMkE6huTdbLm6YAFzN3U2B/96ZG/9GWr1EImuVg9z7vUIlENbG/ARHbdGd +TqwKzjLPMhMRmSQt9pjOA0K2/o9y7t6JgQiMC1DPl21INZHmYES9dlfyEiaLjVYk +VunL/tJHXO9RIoqWx5nPuQENBFaTa+4BCAC8D6XyewOHX+nTc4mBQfLmrmNJu6RX +7kY/cwvAsskevOTNPzgJJtnUJQI1iABWI7U88afjAvU1wzYrBfEfQ43h1cPw6NMY +4/cmHe8YimCgk8cNYKGS0sM3+YJ8hNTSGxKJa7Y3RDxDLK9fSqG1xa6URcctNT57 +rau7xUtVExFpN0qGeTtMAOLDp36wY+jSYBpVZ7/Z/j0SDQf9ShU0G2OZMKsZvcH1 +KadOVW4kT27ISHN7EJbjdMPCmZytJ+5Sxi9PFHYCr/nR1qBY/j0ouKS71uShzcss +z5WgnkmP87fvsfpfCQJl5SkiPavddodZoBCRRKwqQnV7ns3JFmh7U2+lABEBAAGJ +AR8EGAEIAAkFAlaTa+4CGwwACgkQ/geEEX+84R040gf9G+I/AM1ub7UAhPAQPZ25 +SdIaTH96MV5cmWsucTnGUy1XDh8I0hZaEB/kkWHOrmbKyqhg/NtgEqXtP/kqJX5r +uTt9AN3TSlxJ+IrCywCm33kS7yPRADgwNshoCf/HH3VujccN4KfDjIuijLSZbfIb +G6cGo2bgqz6t4p9NaZofcQhFfPwAgfv3IL1DNFqZvUohDPy/j5eU7IdDjytLnhGU +ZTfSrzhWXkCZybKROW05zScMRd5uL3b+in/Zu8rgeE/lLF8nmD42YJ058n+72LjR +7P5DqrblbAhLiQg8CBbrIFJozQUyUDnTzwsGRFuQAx7brypsOSqWfYcVEqXxiJwd +rLkBDQRaK92CAQgAuuXV+Yh0qYO6WQZLnE+X0BivPlRY1vH4B2zDgDBY0qrbIdPl +4/pvbwQLk/Vo2yVZqHfoGhbqnBkXZFpzV9QMOnEdrrMo8unm/02f7buEZ56XkkKT +pelsl63Qu0qu2/ISpfxCxRFLGZdj+VLA0SWhe0ecwgR+91ZvcKE1byfzG9+sbVY0 +v8WQq9Zfx0hUo/0Jf7+FAiUWIgmS6XHuCn+DYBTHrGcGEf+CU64+lfH5CbGz42AK +qsYzZwYWV4RarwNBVDuM6XdqlC9m4WcROos5qyV0XQ5sE/SByuHO1a5ZazFFPbrn +qiBtg1POQs4uQw4wU2RsEM+bGUIRNTFoIpjHsQARAQABiQJsBBgBCAAgFiEECqx3 +W7ZDeo2a96Os/geEEX+84R0FAlor3YICGwIBQAkQ/geEEX+84R3AdCAEGQEIAB0W +IQSzyzZlUlQL4G7prZcRloxEkoyu/AUCWivdggAKCRARloxEkoyu/GVJB/90wdV5 +Bsb53X/ai1HdScE7dP+clhDjVEgU87601F7cntzeo9EASso2YLdkXnNE4Gq8THUp +XLk/PLTlum5z2OrOYbcfrzWU1kLRguDgVciqcyI+4ev5P5wchTrLrROX7uyEGq5f +THYi7xEmolRGXFUEAcsWRGwS6DOq28sDSbho+LRLXyPBFVE6lTmXzjIaw5pxPgMX +HGPjb2vuHP3hcFS38CkbKgFgnvlCzeCea3y6rVs86xVUi/l1C/tAdTFHkxbQQzyo +bNWOF55ujh12iWOPFqlaLXSJcSgRb6JBumPS3X4g3DEOeWLKOXgqXXWdTz9n925G +1s9Zz5EqRGOPg5tUNpoH/iDhWtorPX9ypuWLPmJzq/e/6l7d1YY5p1FP88fG+33L +DOxP69pCqfIoS4h3xtIBtq6ZOD8veVhb4GXSX3o1/rHEur1wj8JdIKTiyLQcc0bE +/qqkU1z2wtPDnpDMiSp+K0XzuerrOkTR3Nvbjq1N3eAT7cp9u+t9jINBe4L36+Dz +QZdwUGvi7ojMPTY2vKM6VZSHEKDmw1C4Ifp9oSEVAlQk2AslldLA/8huA3V752+C +osVz4kO0g/fi1LqkTskFfRVO7Y1Zbs5N4qb/2rdXp4cYEmKNe/II+y9xoCxyobBE +ZBECLHCZfIdO2sB4nt72Y+0/G52cW2Gz2yjbP0MaZp25AQ0EWivdvQEIALOgPIfa +CxMoYYORHfLJsJ56uOGP6YchINfy7wGVvtNPvnbC4Xp6q8UPSijoukjafw5ZPZFu +BZ7E3Qq4Vx/eRTcHoYq40CahxFDmUvt6bnDCFlsMXNXCSOUtnhej5clMjCtm7awt +kOD25JQry3AmmxAeQv807LBciYy+/idRlav1sQyUOgchiS/nsSQX+lktjwXKks7Q +j/3Oplu+D8jTig2qGdNUredkbgZhsVsdvitmuJuBq3Iaw2ilX4l69g9ioxBi7481 +bmaLV1P2BtHsqUpmE7wpw4JdQ+NTBiAPuM+Oqo28mWTVoov5SH9QHOevgVJKCfM7 +RfBj8zGVJ3H/DcsAEQEAAYkBNgQYAQgAIBYhBAqsd1u2Q3qNmvejrP4HhBF/vOEd +BQJaK929AhsgAAoJEP4HhBF/vOEd33QIAIV/Wuhv+KHYKkKzwzJYqEZEKReFqSk9 +1W+etHDf72mPB3J+IfokNYCSgEm4R/570p9uIBBccxLPwTvbJU7v9Utvc0kFcu9t +xNWOge0W046qquRoWIwFZxbLwcSl8Xwlhitrt1TAZPrsIRxyzXzHeE9VTIAWQftn +jvRGp8KfdCXoLglMkb4KRF65pzMPf51hPSQ57b2VhmwZoh9Y4b5FM4cgKdoug2Ch +/gPFWTd0KGWuSRs8xKnUugk3X0j089po81j1DTcMezAz9QZbSs1qM1Phxl/SaJEE +wb/SP6PaGS9MPvfMpshuzz/St5LWesGCOJHMG6cWIm/QAFIuV7WWKpg= +=K6Sr +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/kinfocenter/keys/pgp/1FA881591C26B276D7A5518EEAAF29B42A678C20.asc b/libre/kinfocenter/keys/pgp/1FA881591C26B276D7A5518EEAAF29B42A678C20.asc new file mode 100644 index 0000000..5e190f1 --- /dev/null +++ b/libre/kinfocenter/keys/pgp/1FA881591C26B276D7A5518EEAAF29B42A678C20.asc @@ -0,0 +1,23 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEa0sssRBACshV1hJ9qHhy2NIoQ/Pj5c4BLkoU3pn+V2sgLHNdxxyHoFlO9a +YJxFAdFBZOLGcIExHNeQcrkOg1SDHYZkjcuKdmtlHL30fvozzrvjaQA1S2Pk2A5H +fhVPH9pHTzeRUAutGSLKTc+tKfHxgJGaoyFwoTYMgFObDVJZK4obGAyHAwCglJFf +GEuwhFnGR9PC/i2/fOSjvWMD/3j9zl4LUqSjjm9HbMaPt0Ibd0mg7V5QFF0edrIt +YhgtADYAGB2oOezA71w2DYYDFqQ5LqFaRO1E1sJuc3CULJ8f1c/DMcCpeAsj6uWj +s5oqu7RppWOXPMB+lW9Bf6TpvBGLSxMb7W3Hl7oqhcxex97KXoGY+WldH9Koqw/r +PHvHBACpVdpR4XMKFhiNdByjaXzGbRa8lrk/xzM39IH8exiu/AJIYnsESubpOUb8 +lKYhpzd03BhJwyufaJ3s7TYgzS5YmDoJExFxrUADxLGyaQsm2IgNJo2fJMDIehfK +Q13FJtYoM/a6QR/GRBPjEgKmb5aiy3draNafw5sNW6E4zVccdbQgTWFyY28gTWFy +dGluIDxub3RtYXJ0QGdtYWlsLmNvbT6IYAQTEQIAIAUCRrSyywIbIwYLCQgHAwIE +FQIIAwQWAgMBAh4BAheAAAoJEOqvKbQqZ4wg7/EAnAnWRJ9flgZaD8jz71Hp28w2 +PCrQAJsF89uKsYkfgRIgvmActqhuYiGSprkBDQRGtLLMEAQAqCFioBCqRazmB87L +Vec8ai7CT18rvwCpPkrfEM5xUkDiFuT9zmh5cE1GT1RxCh3XZ1S63n+z5LBwta7y +WqoUP1HSoVJ4hI5TKdJ7T/VCkqRkmcUXnHV0hEo7fsVt6t/z5mJzWhvRRbKgBB0w +7GUOfnknz8SSc5sAmH4uDbwadZsAAwUD/3eG6/F3BeemcuWDQ0bX3aG0VTcnxnlG +iv0CxEiuQASVCTK9EwwTStbTfO0Qf0v/YgxL43jX2miPSHMlqyK59LBlRr6HgpgF ++YbD9Ev9eJag4ePIpN+zVhkAKyL8u4sdYszozcuww7y5wHUkZIkbW4oEaaj8f3PU +076ZnMOh63YPiEkEGBECAAkFAka0sswCGwwACgkQ6q8ptCpnjCBmlQCfStiAzALE +kDokmj/K+gzQQXH3UAMAn1eVX5gG0IvFYJFSKBQ25OjbtIe0 +=R1D6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/kinfocenter/keys/pgp/D07BD8662C56CB291B316EB2F5675605C74E02CF.asc b/libre/kinfocenter/keys/pgp/D07BD8662C56CB291B316EB2F5675605C74E02CF.asc new file mode 100644 index 0000000..1ad5ba8 --- /dev/null +++ b/libre/kinfocenter/keys/pgp/D07BD8662C56CB291B316EB2F5675605C74E02CF.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFG1+bQBCAC3p+fdi9+55LFuKPqW0XrQkQQ2CRfXcM5lqb6B4xQewLorsdX7 +SRDmLzpdDZ9bCpqxMsiFbB+9lxljHNTzx9BIEO9w6aYtVgPsG4L9ZxwBXUTlgtIA +UoOy4lTQnUR0QDFlJQx8c4Cy82htOSCiWO4iaEvMbo+BGe8g4f2/N0tJOrnAc/xl +sdA64GTWId4NB12F+QeRgWWNQs/W/j/kyy37+L0juD06RMKth0uRMN37wEa9KcLa +lOBEUETrImZfx74wagt6WDnJknLf0ceqzfojk82po0C46BJAu49tLehYYKgo0HKZ +fK7CDw53y9SjkI8cU8g48AyUw8Uk/FyJeW1bABEBAAG0N0RhdmlkIEVkbXVuZHNv +biAoRGF2aWQgYXQgS0RFKSA8ZGF2aWRlZG11bmRzb25Aa2RlLm9yZz6JATgEEwEC +ACIFAlG1+bQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPVnVgXHTgLP +KD0H/0Cnj1bM6MYV5nKXJhLpd8as2OHFlhdtaU7QG3QcMVqdtP3rdOp1RgjmkYsB +xgwrxvDTLz0L/PH9UTCXjQeZgNR0hG8iy4IBC9ay0PDdkNpjnHoAiUMRstcDODUZ +QdLEOXCbPbRG3q0OlSaOvETL7YkSY8c2N6yqmWaJvudpJ0VVPyIWa2xT53JTXgAD +4m1w8MThAZBZpJi852nQCByCsRC+3cofA7bQd60XLiFWgmnq+rlqryMlWvUmMmat +e7U1NC5UsfH6ToXf/ZNZG+fMGE+ntYiHWRFr2tZMyXfUOrgHsAVMAE8v/xVtwS5e +VCAdM21GNG4d6XiF7T32GDzrEQm5AQ0EUbX5tAEIAL0uLkPxHbg9boIuVdahyy6F +BOcUf8xj3qj8FUGpRkcSSsoyvFTHZRTR+wwTPTaZzzzTFSITRGVv7vdKyl/A+SMw +/nlUVfB9xGvvCgzPGesUk9lmxX2DRVpoq9CyVIw0XXJQtNkC3O1yEws4zuDzHe99 +sfDvXpA1ikfN+Hgn3oLjCHHtWuTyXGKXUimzToDMqWentVkP1rzKPlin9XJ0KDT/ +axrrD9L5s4KCjHdWEQwG3miJDxQnlsAFDBj7Bs8DZZE+xdzx/l8qBKOxmXD9ohFp +4q0wXVV4QJMHtjhvhId9EN965drlYmMfusMCwavklBOWdR1MdSSBIYPS5eISmj0A +EQEAAYkBHwQYAQIACQUCUbX5tAIbDAAKCRD1Z1YFx04Cz4CzCACpN1l39Yzoniqx +laabcOrEbFjhKXlFXPm5TC+nj2iO8BieJLoltTcQL1nbxBHcxMkxUUJAVKBSmlh3 +BPjYJhXBNRvW/gamjaO+LoStXI+0vO4aOhkR0tLqA9/zQFM9uVPu6InS0N98oMaL +azyxnXuqEanCN7yWfKHKxmkKiVMB1RMaE+2TYQBKPfFukiX2vv3qByVez8qYGa98 +80x6fkrqFbPoJ2oDXEGGD0W7fkv1pZV/1XCuXV/qKz3htD3AQDuLijqt6sM9Oe7Y +Lsv5lqTb5DK6g2N9xvhTz64Z+j9bf44fbMReg3ub3GXlf9rFT8eDYfyYLJgWJ/1h +YZximth9 +=QnRI +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libre/kinfocenter/keys/pgp/E0A3EB202F8E57528E13E72FD7574483BB57B18D.asc b/libre/kinfocenter/keys/pgp/E0A3EB202F8E57528E13E72FD7574483BB57B18D.asc new file mode 100644 index 0000000..43ecac8 --- /dev/null +++ b/libre/kinfocenter/keys/pgp/E0A3EB202F8E57528E13E72FD7574483BB57B18D.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGFVmzkBEAC9robLj4ZMjZ/EhHbiYpr2/i/uW38T6qP5mwpAGela3/NWhjzp +2a6rfuLTb6OtXkomcMiwzVXBm2VCoF5z7f23c5yCk4qPFnTNcYxmql1MaRrI4x9Z +b/iV6jit/FkiNPCc/89kvfWVMywCb/0uOGRbzw9lGNQH+2bJkHLDS38PfrABikOK +di75Ux1pOl64GVnKxqfXSB63d9eDtLELEbjvbPRdZJSuFTFLlR+uZKivsCx7LPhp +S/EPyW1SnV9Jy8ZAgMHz0VZnkZnC2W15uM8FP6ARUtxlYMptUuU79iERYKd0xwCH +JT4GI3PFMjAML/XHzkzzXJgkZm1YMjy2dNHKc07glA6efqrb82BzqWp6mfuUnYBl +nO54yDUwUeDWuRvZJwNxv0j31eADYlZoPkkPX6UWqayeAcPEBPofiasxUw5mIfP/ +3HAsJcDjf3Oj5tYyE7ELypqTWPvS2fBYCWwvipfxsOQmA9xvlCY2MGhAtTNceJcb +324bOLpuwA2GWmsyHw+c3bvLD7PDaeLZ7kjqu1NBqgwDESgO7sPrWKM4Gaclgr9s +Atvfr/vlkHRCTZhpluZuW/JIuiprc9O/ZigT9A9lxbQe1Cm0VPNHk+zDl/wPTv7J +EC5OGPAY7G6s7bQLxp7C7FulOZcjKWmnEBWVV1O7iee8YZQ5vZTmTNI2VQARAQAB +tCZKb25hdGhhbiBFc2stUmlkZGVsbCA8anJAanJpZGRlbGwub3JnPokCTgQTAQoA +OBYhBOCj6yAvjldSjhPnL9dXRIO7V7GNBQJhVZs5AhsDBQsJCAcCBhUKCQgLAgQW +AgMBAh4BAheAAAoJENdXRIO7V7GNcZEP/RhsneV30lQg4Qj7Jd/uFhhrvMHTatw8 +F18bMWr7g/sbQ0z7cewT8YM+2W29FC4k3gZHA8Lwfq8g5LAM8Gbvaggn7LrTvglL +i+hX/U4iU7LoqyH1tpyZEPD08qqUkjER8bfLflBElISjGb7xeJMbhS+10vt8QQQl +W7MqRQQo0bYB6foLrmW3avzZz/mb2IL3RAWgowQJ9rxG+oW+3lFCjSGvxXaq/BGc +Dajkq9UeDGCR3RHOjkDVEX6xuS7D76K0Y32bgYbsDzHkDHRm5vR0LXxQKUC59OQE +oNLCdOdFlX4m1Lm2sUa/vXnjrpOPAJvij+LwDt/SB1GygJ/qitO+riTtgSbmyTY8 +4xX4dAh4Nenmk1JF3phfwa3nmJzVu7oiCvKTsVrf8gnJUPq8MsgUuWgQ9qu0UXWR +bFnnckVsj6xBGuPIgrlGk2V9RTqiReJTsU/RdypVzO6rshEyLWS0TCzygHrZk3IS +4pORUt6itUlJSCdvZRDa3AhPUkQt3Iso0S8oZWzP+zlXMvYFvF1pgtzi9cPqbgJJ +4uQJ858uqw0jwjFM3CYyrVrLWNY2kPIPVbeTH6Bh6nQp4Q0KXnDubcUbbpd2xMHl +tHEI6gma9ATha+u/OMjYgXpkAP8UECcF1CD+wIC4c4pbSFnOmhRai92MjbMkb905 +kYzU/1S3qZ9nuQINBGFVmzkBEACU19R68g6TnrnpUCywwCTVZJkY2JVpSlQGYXjd +gC61Kt0vjMCA7sdckSqfE0qTIjxHmDB78F2cpSfDmKEgd8GYdxMuUqTWS7UWRD3R +bvDUBRLG/KMig+6HGe+NzxOv+vwCcnvM3LAZP/k/UMbVAOYQFARvm136UOaTnq1B +vsnDAMoO+US72OWVXzTWcgbJLoLq0HKfCrA0fDKnnh0HPGQ+58qPfoWuatZwg+O6 +0oIE2d5qLrSxAPuUJjaWD1ylNlSbunQNbgHmM1eKK36RUNOc1fDGPWQ1E0+eZuZY +5HfnHFDliZ5rsJsKrqOFhANcRu7BpOWGVSBqms+NjkCUOGwU7ir9jgIBDxdju38u +ri3BCDSYPrDrsuFPSLIab/BuaEcbzLsgAAooMbMHFy2WBqw1WtJatGhg+naoJjha +xbecaOgU140ObnqQdRd2PpLmIRAze5oFvj9TL6NEvkkhWoOW3MUHbV/sgilvN4pu +L+J+ligowbwhny+yfk0XtXZk9nU0/en9UYUFvyQgxi9l+KE6wyl1N74RHvELtPOp +60lOMCB/CAF+q5D3XI4g9LNv3kyCBp40Fq5XiVcMOMamNxq7vc8+2IaSzRiySeQ6 +9hddhKf7Rm7x4ZjW3bVxFu0DAQi4CSAsz3A+/g0z4GDrZDqZyNy0VxcXTE9ZZrih +NvoTvQARAQABiQI2BBgBCgAgFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFVmzkC +GwwACgkQ11dEg7tXsY0EZRAAh9MbJCBdbVa5h2m3AAbYG+BMZsOeSESQCuy0bM7z +7WShfSafeGE/KhJuAKZtBHopLA1VCF74h3vNwwDxAG+8qbzGxuuzV+Tx18vyiY3d +Wlf30L1ypq6fO53fuZSgPB0gzjCoDcJeSDg7FdTcqMzjumys3ThvOBTHB1gwzQWu +eZ8CSxKvd34J7CQ7bUpxjDvgZpI3gbdW37F11KUgLF+HtD1bO9SzTs9rdpGpFesS +joF2pl2C0plzlB40xgb+CW4GL7T253x1xKejCeas2E4ImmD2ONuOqp7Q31x456cQ +r/WqJe7A4lIDRVza2/Nd0qGBCEILmMlIMD+YpZdQv+WO/d6Gv65wt4O+ufjudKcI +sIryz7bVC28zOiAwmVmnDhOkAakAkIJVTMa9xyFVtquBfj9z9mg6W7LLw96tAVXT +6yKkQRHkQ2/36uBgsrl2z+k+mFWm4IS2RGgDfTtrq4nl/LGwyb9T0MDuFZ8FUPUN +PK28Z1iYWb0tTda5Qc5aCraZcFr0aR4PYToBvt5mvrV+TGvfdVzva/JjcRwtFnwo +RUqSlBSJqC4WqZmkB73i16MljvT0+4v2upmud4JKw2KTowhZjbGLlBgrAMxuDYNv +953PoIbKKuD9uwdPkCrkuL1XQsBDWsHgW9DQ4q0bObr0ZBxJWUzLj/5Ew1iFLz5O +oS4= +=yOFv +-----END PGP PUBLIC KEY BLOCK----- From 820d35ef735f7ad8942f2e5e1060bfa99d46c5b2 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 22 2022 11:27:52 +0000 Subject: [PATCH 100/200] [rz-cutter]: upgrade to v2.1.2 --- diff --git a/libre/rz-cutter/PKGBUILD b/libre/rz-cutter/PKGBUILD index a15377d..ead028f 100644 --- a/libre/rz-cutter/PKGBUILD +++ b/libre/rz-cutter/PKGBUILD @@ -4,40 +4,41 @@ # Maintainer: bill-auger pkgname=rz-cutter -_gitcommit=6dab092b515024ba769e81554c91c0d8b9883264 -pkgver=2.0.3 -pkgrel=2 +_upstream_name=cutter +pkgver=2.1.2 +pkgrel=1 pkgrel+=.parabola1 pkgdesc='Qt and C++ GUI for rizin reverse engineering framework' url='https://github.com/rizinorg/cutter' arch=('x86_64') arch+=('armv7h' 'i686') license=('GPL3') -depends=('rizin' 'capstone' 'qt5-base' 'qt5-svg' 'qt5-webengine' 'icu' 'python' 'jupyter' +depends=('rizin' 'capstone' 'qt5-base' 'qt5-svg' 'qt5-webengine' 'icu' 'python' 'pyside2' 'python-shiboken2' 'graphviz' 'gcc-libs' 'syntax-highlighting') depends=( ${depends[@]/qt5-webengine/} ) makedepends=('git' 'cmake' 'ninja' 'shiboken2' 'qt5-tools') +makedepends=( ${makedepends[*]/git/} ) +[[ "${CARCH}" == i686 ]] && makedepends+=( llvm13 ) # /usr/bin/shiboken2: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory +[[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]/rizin/rizin=0.4.0} ) # CMake Error at CMakeLists.txt:54 (find_package): Could not find a package configuration file provided by "Rizin" with any of +# FTBS armv7h and i686 - /usr/include/librz/rz_util/../rz_types.h:10:10: fatal error: 'stddef.h' file not found optdepends=('rz-ghidra: ghidra decompiler plugin') -source=("git+https://github.com/rizinorg/cutter#commit=${_gitcommit}" - "git+https://github.com/rizinorg/cutter-translations") -sha512sums=('SKIP' - 'SKIP') -b2sums=('SKIP' - 'SKIP') - -pkgver() { - cd cutter - git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} +source=(${_upstream_name}-${pkgver}.tar.gz::https://github.com/rizinorg/${_upstream_name}/archive/refs/tags/v${pkgver}.tar.gz + ${_upstream_name}-translations-git.tar.gz::https://github.com/rizinorg/${_upstream_name}-translations/archive/refs/heads/master.tar.gz) +sha512sums=('0a8e2443c149e4d81d8e91bdf209420ad0a13bcb072c5a41c4d20bc5ea91ff62793cebd7c1aa0c37699c2653cc868598b5fb6d6b45db88c093c96ef672016dcf' + '4cc46a1b79aca9fe0a8d5983ef85d11ff25648f5138156aa729255147e60d8e66f5546134dfd3fc96e24c4080a0001fe429785cdd813079c247e3ad315865c6e') +b2sums=('bd36e2d2b4db044fee2df97eb4a1e8950b68673b59c5eb91435c5d36a47b4ada9122868c019adec7255421fc3de0c44d1ab260cbdd16e24d5fb129c589686b8d' + 'f11e955d6ce2940e69433a96187116504c59306aad2edd8931d6593aa8b576d430b01cce5b6ca4497afad92455f4e830d0bf85e2eae8cb5de426f0b8c048193f') prepare() { - cd cutter - git config 'submodule.src/translations.url' "${srcdir}/cutter-translations" - git submodule update --init src/translations + cd ${_upstream_name}-${pkgver}/ + + rmdir src/translations + cp -a "${srcdir}"/${_upstream_name}-translations-master src/translations } build() { - cd cutter + cd ${_upstream_name}-${pkgver}/ + cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=None \ @@ -53,7 +54,8 @@ build() { } package() { - cd cutter + cd ${_upstream_name}-${pkgver}/ + DESTDIR="${pkgdir}" ninja -C build install install -d "${pkgdir}/usr/share/doc/${pkgname}" cp -a docs/* "${pkgdir}/usr/share/doc/${pkgname}" From 6aa6e993e96d52723ad062b3a90f39a681abf540 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sep 22 2022 15:06:10 +0000 Subject: [PATCH 101/200] [iceweasel]: upgrade to v105.0 Unfortunately, Arch Linux switched to pip [1], so adding a bunch of python packages, also keeping a patch for python-zstandard as it's still needed. --- diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 99c49df..7d1da56 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -941,46 +941,56 @@ index 7d37d26..4ebbc06 100644 -diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -index dabfadc..3ce732e 100644 ---- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl -+++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl -@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. +diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl +index efba683d66..9fe12b80fa 100644 +--- a/browser/locales/en-US/browser/branding/brandings.ftl ++++ b/browser/locales/en-US/browser/branding/brandings.ftl +@@ -15,28 +15,28 @@ + ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark - policy-ExtensionUpdate = Enable or disable automatic extension updates. + -facebook-container-brand-name = Facebook Container +--lockwise-brand-name = Firefox Lockwise ++-lockwise-brand-name = Iceweasel Lockwise + -lockwise-brand-short-name = Lockwise +--monitor-brand-name = Firefox Monitor ++-monitor-brand-name = Iceweasel Monitor + -monitor-brand-short-name = Monitor + -pocket-brand-name = Pocket +--send-brand-name = Firefox Send +--screenshots-brand-name = Firefox Screenshots ++-send-brand-name = Iceweasel Send ++-screenshots-brand-name = Iceweasel Screenshots + -mozilla-vpn-brand-name = Mozilla VPN +--profiler-brand-name = Firefox Profiler +--translations-brand-name = Firefox Translations ++-profiler-brand-name = Iceweasel Profiler ++-translations-brand-name = Iceweasel Translations + -rally-brand-name = Mozilla Rally + -rally-short-name = Rally +--focus-brand-name = Firefox Focus ++-focus-brand-name = Iceweasel Focus --policy-FirefoxHome = Configure Firefox Home. -+policy-FirefoxHome = Configure Iceweasel Home. +-# “Suggest” can be localized, “Firefox” must be treated as a brand ++# “Suggest” can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefox-suggest-brand-name = Firefox Suggest ++-firefox-suggest-brand-name = Iceweasel Suggest - policy-FlashPlugin = Allow or deny usage of the Flash plugin. +-# ”Home" can be localized, “Firefox” must be treated as a brand ++# ”Home" can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefox-home-brand-name = Firefox Home ++-firefox-home-brand-name = Iceweasel Home +-# View" can be localized, “Firefox” must be treated as a brand ++# View" can be localized, “Iceweasel” must be treated as a brand + # and kept in English. +--firefoxview-brand-name = Firefox View ++-firefoxview-brand-name = Iceweasel View diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl index 1b29e8d..6f7566c 100644 --- a/browser/locales/en-US/browser/preferences/preferences.ftl +++ b/browser/locales/en-US/browser/preferences/preferences.ftl -@@ -550,7 +550,7 @@ home-restore-defaults = - # "Firefox" should be treated as a brand and kept in English, - # while "Home" and "(Default)" can be localized. - home-mode-choice-default = -- .label = Firefox Home (Default) -+ .label = Iceweasel Home (Default) - - home-mode-choice-custom = - .label = Custom URLs… -@@ -577,10 +577,10 @@ choose-bookmark = - .label = Use Bookmark… - .accesskey = B - --## Home Section - Firefox Home Content Customization -+## Home Section - Iceweasel Home Content Customization - --home-prefs-content-header = Firefox Home Content --home-prefs-content-description = Choose what content you want on your Firefox Home screen. -+home-prefs-content-header = Iceweasel Home Content -+home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. - - home-prefs-search-header = - .label = Web Search @@ -714,16 +714,6 @@ sync-signedout-account-signin2 = .label = Sign in to { -sync-brand-short-name }… .accesskey = i diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 08ee3ba..f5e83d8 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -62,7 +62,7 @@ pkgname=iceweasel epoch=1 -pkgver=104.0.1 +pkgver=105.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -73,11 +73,11 @@ license=(MPL GPL LGPL) url="https://wiki.parabola.nu/Iceweasel" depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb - autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-zstandard lld dump_syms - wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) -makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) -makedepends+=(python-pydantic=1.9.2) # pydantic 1.10.1 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not) + autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python + lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi + ) +makedepends+=(python-setuptools python-zstandard python-typing-extensions + quilt libxslt imagemagick git jq python-jsonschema) [[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) @@ -91,8 +91,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'xdg-desktop-portal: Screensharing with Wayland') replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) -source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - zstandard-0.18.0.diff arc4random.diff +source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc} $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -101,24 +100,24 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra 9003-FSDG-urihandlers.patch 9004-FSDG-misc.patch process-json-files.py - vendor.js.in) + vendor.js.in + zstandard-0.18.0.diff) source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e' +sha256sums=('2b5becbb89aa2b2007ba8c86ad517aeae1b54904d007d9d3acbf054be6a0ed62' 'SKIP' - 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' - '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' 'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' - '2697d54f827a493f7d74b8b8b01a10c70fd286a02924faae0d09c5f432a841a8' + '370dd0855d8ec56970fb389bdb69f5e44465e4d66be1b38f23589653923086a2' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' - '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45') + '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45' + 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' @@ -218,9 +217,6 @@ prepare() { # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff - # Unbreak build with glibc 2.36 - patch -Np1 -i ../arc4random.diff - # echo -n "$_google_api_key" >google-api-key # anti-feature # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature @@ -377,10 +373,12 @@ END for size in 16 22 24 32 48 64 128 256 do rsvg-convert -w ${size} -h ${size} iceweasel_icon.svg -o default${size}.png done - cp iceweasel_logo.svg content/aboutlogins.svg - cp iceweasel_logo.svg content/about-logo.svg - rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png - rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png + cp iceweasel_logo.svg content/aboutlogins.svg + cp iceweasel_logo.svg content/about-logo.svg + rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png + rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png + cp content/about-logo.png content/about-logo-private.png + cp content/about-logo@2x.png content/about-logo-private@2x.png echo ${blank_svg} > content/blank.svg popd > /dev/null diff --git a/libre/iceweasel/arc4random.diff b/libre/iceweasel/arc4random.diff deleted file mode 100644 index c877d54..0000000 --- a/libre/iceweasel/arc4random.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -index 101d39d455107..3764806240f9f 100644 ---- i/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -+++ w/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -@@ -30,13 +30,13 @@ - /* #undef EVENT__HAVE_AFUNIX_H 1 */ - - /* Define to 1 if you have the `arc4random' function. */ --/* #undef EVENT__HAVE_ARC4RANDOM */ -+#define EVENT__HAVE_ARC4RANDOM 1 - - /* Define to 1 if you have the `arc4random_addrandom' function. */ - /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */ - - /* Define to 1 if you have the `arc4random_buf' function. */ --/* #undef EVENT__HAVE_ARC4RANDOM_BUF */ -+#define EVENT__HAVE_ARC4RANDOM_BUF 1 - - /* Define to 1 if you have the header file. */ - #define EVENT__HAVE_ARPA_INET_H 1 -diff --git i/toolkit/crashreporter/client/ping.cpp w/toolkit/crashreporter/client/ping.cpp -index 57cf85de80b79..93a2f6e80ad0b 100644 ---- i/toolkit/crashreporter/client/ping.cpp -+++ w/toolkit/crashreporter/client/ping.cpp -@@ -53,7 +53,7 @@ static string GenerateUUID() { - - CFRelease(uuid); - #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ... -- arc4random_buf(id, sizeof(UUID)); -+ arc4random_buf(&id, sizeof(UUID)); - #else // Linux - int fd = open("/dev/urandom", O_RDONLY); - diff --git a/libre/iceweasel/cbindgen-0.24.0.diff b/libre/iceweasel/cbindgen-0.24.0.diff deleted file mode 100644 index 3011e8a..0000000 --- a/libre/iceweasel/cbindgen-0.24.0.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places. -Author: Olivier Tilloy -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 -Forwarded: not-needed - ---- a/gfx/webrender_bindings/webrender_ffi.h -+++ b/gfx/webrender_bindings/webrender_ffi.h -@@ -73,8 +73,6 @@ struct WrPipelineInfo; - struct WrPipelineIdAndEpoch; - using WrPipelineIdEpochs = nsTArray; - --const uint64_t ROOT_CLIP_CHAIN = ~0; -- - } // namespace wr - } // namespace mozilla - - From 8e32f59910417462fdad832840c070b9bda74ff0 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 22 2022 15:06:21 +0000 Subject: [PATCH 102/200] [iceweasel]: tweak for i686 (still FTBS) --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index f5e83d8..9d97739 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -23,13 +23,18 @@ # parabola changes and rationale -# FSDG: +# libre: # - Modify the addons pages to use GNU IceCat plugins sources, rather # than addons.mozilla.org, which hosts non-free addons # - Disable EME, which is implemented via the non-free libWideVine CDM # - Disable Normandy that let Mozilla push messages with recommendations # of nonfree software # - Make Remote Settings work completely offline using local data +# - Use system python libs. The arch package uses 'pip' to download +# dependencies from the internet at build-time, despite that those needed +# dependencies are already packaged in the arch repos. So strictly-speaking, +# the package is not built from source, as some sources will be missing +# from the published source package, and will not be required as makedepends. # # technical: # - build i686 with GCC instead of clang @@ -70,7 +75,7 @@ pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) arch+=(armv7h i686) license=(MPL GPL LGPL) -url="https://wiki.parabola.nu/Iceweasel" +url=https://wiki.parabola.nu/Iceweasel depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python @@ -83,15 +88,18 @@ makedepends+=(python-setuptools python-zstandard python-typing-extensions [[ "${CARCH}" == 'i686' ]] && makedepends=( ${makedepends[*]/wasi-libc++*/} ) [[ "${CARCH}" == 'i686' ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin [[ "${CARCH}" == 'i686' ]] && makedepends+=( llvm13 ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory +[[ "${CARCH}" == 'i686' ]] && makedepends+=( python-pydantic=1.9.2 ) # pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not) +# i686 FTBS - mozglue/misc/SIMD_avx2.cpp:66:10: error: ‘_mm_cvtsi64_si128’ was not declared in this scope; did you mean ‘_mm_cvtsi64_si32’? optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_US: Spell checking, American English' 'xdg-desktop-portal: Screensharing with Wayland') +# provides=('firefox') # TODO: redmine #2164 - currently conflicts with 'your-freedom' replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) -source=(https://archive.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz{,.asc} +source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -214,9 +222,15 @@ prepare() { mkdir mozbuild cd firefox-$pkgver + ## technical patching ## + # Unbreak build with python-zstandard 0.18.0 + echo "applying zstandard-0.18.0.diff" patch -Np1 -i ../zstandard-0.18.0.diff + + ## general configuration ## + # echo -n "$_google_api_key" >google-api-key # anti-feature # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature @@ -512,6 +526,7 @@ build() { export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature + # export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip # parabola policy violation export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # LTO needs more open files @@ -666,7 +681,7 @@ app.distributor.channel=$pkgname app.partner.parabola=parabola END - # NOTE: browser/branding/$theme is $brandingdestdir in configure() + # NOTE: browser/branding/$theme is $brandingdestdir in prepare() local i theme=$pkgname for i in 16 22 24 32 48 64 128 256; do install -Dvm644 browser/branding/$theme/default$i.png \ From 4edfdd5c39ffb5dc842dfbe77152ff73b4475f66 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sep 22 2022 15:12:56 +0000 Subject: [PATCH 103/200] [icecat]: upgrade to v102.2.0 --- diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cc4eac0..a1ec468 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -18,14 +18,14 @@ # NOTE: icecat (60.7 < V <= current) are not complete upstream releases # upstream releases normally have $_upstream_ver ending in '-gnu' # this build is based on gnuzilla VCS developement sources -# rev: 65a61287a5142a9403ec00d973cb5e5d658a3c71 -# with parabola patches applied +# rev: e77a1fa25ac66250e88d5d9901a2ba670edb94cc +# with parabola patches applied (offered upstream) # https://git.parabola.nu/~bill-auger/icecat.git/log/?h=parabola pkgname=icecat -_upstream_ver=91.11.0-gnu1 -_upstream_ver=${_upstream_ver/-gnu1/-pre1} # parabola pre-release +_upstream_ver=102.2.0-gnu1 +_upstream_ver=${_upstream_ver/-gnu1/-gnu0-pre1} # parabola pre-release pkgver=${_upstream_ver//-/_} pkgrel=1 pkgdesc="the GNU web browser, based on Mozilla Firefox ESR" @@ -35,9 +35,11 @@ url=http://www.gnu.org/software/gnuzilla/ depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard lld dump_syms) + python-setuptools python-psutil python-zstandard lld dump_syms + wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(jq python-jsonschema) -#makedepends_i686=(gcc10) +makedepends+=( ${makedepends[*]/python-psutil/python-psutil=5.8.0} ) # | psutil<=5.8.0,>=5.4.2: Installed with unexpected version "5.9.1" +makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.17.0} ) # | zstandard<=0.17.0,>=0.11.1: Installed with unexpected version "0.18.0" optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -46,19 +48,17 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'xdg-desktop-portal: Screensharing with Wayland') options=(!emptydirs !makeflags !strip !lto !debug) source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig} - icecat.desktop icecat-safe.desktop - 0001-Use-remoting-name-for-GDK-application-names.patch -) + icecat.desktop icecat-safe.desktop) +source+=(arc4random.diff) source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661' +sha256sums=('0a5edd6adcc3de32adfc9452d89e0144cfb9a7dceacef3202e716fb4d5a8fb9e' 'SKIP' 'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d' - '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208' - 'a7f5ae9f018678a391739365329a5a5b527b536bc9aac441c73ae811d2fa530d' -) + '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208') +sha256sums+=('714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' @@ -72,7 +72,7 @@ _should_skip_pgo=0 # for x86_64 _check_build_config() { - pushd "${srcdir}"/${pkgname}-${pkgver%_*} > /dev/null + pushd "${srcdir}"/${pkgname}-${pkgver%%_*} > /dev/null echo "Checking build configuration..." @@ -106,13 +106,10 @@ _check_build_config() { prepare() { mkdir -p mozbuild - cd "$srcdir/$pkgname-${pkgver%_*}" + cd "$srcdir/$pkgname-${pkgver%%_*}" - # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 - patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch - -# # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736 -# patch -Np1 -i ../rust_1.48.patch + # Unbreak build with glibc 2.36 + patch -Np1 -i ../arc4random.diff cat >../mozconfig <>../mozconfig < Date: Sep 25 2022 23:10:49 +0000 Subject: [PATCH 104/200] remove uneeded [libre] replacements and unused PKGBUILDs Signed-off-by: David P --- diff --git a/libre/abuse/PKGBUILD b/libre/abuse/PKGBUILD deleted file mode 100644 index 3f8ded4..0000000 --- a/libre/abuse/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# Maintainer (Arch): Alexander F Rødseth -# Contributor (Arch): Lukas Fleischer -# Contributor (Arch): jlvsimoes -# Contributor (Arch): kevin -# Contributor (Hyperbola): André Silva -# Contributor (Hyperbola): Márcio Silva -# Maintainer: Omar Vega Ramos - -pkgname=abuse -_pkgname=$pkgname-libre -pkgver=0.8 -pkgrel=10 -pkgrel+=.parabola1 -pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support' -arch=('x86_64') -arch+=('i686' 'armv7h') -url='http://abuse.zoy.org/' -license=('GPL' 'custom') -replaces=($_pkgname) -conflicts=($_pkgname) -depends=('desktop-file-utils' 'gcc-libs' 'glu' 'libgl' 'sdl_mixer') -makedepends=('gendesk' 'glu' 'mesa-libgl') -mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$pkgname-$pkgver.tar.gz") -source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.gz" - "$pkgname.sh" - "default.${pkgname}rc" - 'default.gamma.lsp' - 'libre.patch') -mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488') -sha256sums=('8f77e8020bf17b10d8a5269d7d4d9bc3592f961ce352672ce183e1f41efc956b' - '8dcf3b6b6ac419e5ffabc847166917d70ce43af3092c4d651f473947fff0cc7d' - '6ea2fa9e65c10bbcab4432f40d0c7284cb3970835c40c5c00ced14b39ce1b00f' - '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6' - '7566a3affb01c64ff4f859bcd549661220847e9c62327e71e1d585c0048f90ea') - -mksource() { - cd "$pkgname-$pkgver" - - # Remove the nonfree claudio addon - rm -rvf ./data/addon/claudio -} - -prepare() { - cd "$pkgname-$pkgver" - - patch -p1 -i "$srcdir/libre.patch" - - gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" -} - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --with-assetdir="/usr/share/$pkgname/orig" \ - --with-x \ - --enable-debug # Fix for FS#52915 - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # Desktop shortcut and icon - install -Dm644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - - # Default configuration - mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf" - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$srcdir/default.${pkgname}rc" \ - "$pkgdir/usr/share/$pkgname/default.${pkgname}rc" - install -Dm644 "$srcdir/default.gamma.lsp" \ - "$pkgdir/usr/share/$pkgname/default.gamma.lsp" - - # License (for the original source code) - install -d "$pkgdir/usr/share/licenses/$pkgname" - sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/abuse/abuse.sh b/libre/abuse/abuse.sh deleted file mode 100644 index 5ffdf90..0000000 --- a/libre/abuse/abuse.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# Copy over sane configuration files, unless they already exists -if [ ! -d $HOME/.abuse ]; then - mkdir -p $HOME/.abuse -fi -if [ ! -f $HOME/.abuse/abuserc ]; then - cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc -fi -if [ ! -f $HOME/.abuse/gamma.lsp ]; then - cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp -fi - -# Run abuse -exec /usr/bin/abuse.elf "$@" diff --git a/libre/abuse/default.abuserc b/libre/abuse/default.abuserc deleted file mode 100644 index ff11681..0000000 --- a/libre/abuse/default.abuserc +++ /dev/null @@ -1,37 +0,0 @@ -; Abuse-SDL Configuration file - -; Startup fullscreen -fullscreen=0 - -; Use DoubleBuffering -doublebuf=1 - -; Use OpenGL -gl=1 - -; Location of the datafiles -datadir=/usr/share/abuse/orig - -; Use mono audio only -mono=0 - -; Grab the mouse to the window -grabmouse=0 - -; Set the scale factor -scale=2 - -; Use anti-aliasing (with gl=1 only) -antialias=0 - -; Disable the SDL parachute in the case of a crash -nosdlparachute=0 - -; Key mappings -left=a -right=d -up=w -down=s -fire=Space -weapprev=q -weapnext=e diff --git a/libre/abuse/default.gamma.lsp b/libre/abuse/default.gamma.lsp deleted file mode 100644 index 9a77afa..0000000 --- a/libre/abuse/default.gamma.lsp +++ /dev/null @@ -1 +0,0 @@ -(setq darkest_gray 20) diff --git a/libre/abuse/libre.patch b/libre/abuse/libre.patch deleted file mode 100644 index 1e3814b..0000000 --- a/libre/abuse/libre.patch +++ /dev/null @@ -1,234 +0,0 @@ -diff --git a/data/Makefile.am b/data/Makefile.am -index cad0b9ff4..abbb8941f 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -35,7 +35,6 @@ lisp += \ - \ - addon/bong/bong.lsp \ - \ -- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ - addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ - addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ - addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ -@@ -113,21 +112,6 @@ art += \ - \ - addon/bong/bong.spe \ - \ -- addon/claudio/antship.spe addon/claudio/bigexp.spe \ -- addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \ -- addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \ -- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ -- addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \ -- addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \ -- addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \ -- addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \ -- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ -- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ -- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ -- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ -- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ -- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ -- \ - addon/example/example.spe \ - \ - addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \ -@@ -214,7 +198,6 @@ demos = \ - doc = \ - addon/aliens/aliens.txt \ - addon/aliens/readme.txt \ -- addon/claudio/palettes.txt \ - addon/leon/leon.txt \ - addon/newart/tiledoc.txt \ - addon/pong/pong.txt \ -@@ -267,11 +250,6 @@ sound += \ - addon/aliens/altaunt.wav addon/aliens/aslash01.wav \ - addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \ - \ -- addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \ -- addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \ -- addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \ -- addon/claudio/unhealth.wav addon/claudio/wfall.wav \ -- \ - addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \ - addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \ - addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \ -diff --git a/data/Makefile.in b/data/Makefile.in -index b27371448..77b140231 100644 ---- a/data/Makefile.in -+++ b/data/Makefile.in -@@ -184,7 +184,6 @@ lisp = abuse.lsp edit.lsp hardness.lsp music/playhmp.lsp lisp/ant.lsp \ - addon/aliens/objects.lsp addon/aliens/powerold.lsp \ - addon/aliens/powerups.lsp addon/aliens/sfx.lsp \ - addon/aliens/tiles.lsp addon/bong/bong.lsp \ -- addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \ - addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \ - addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \ - addon/deathmat/large.lsp addon/deathmat/levelset.lsp \ -@@ -245,23 +244,6 @@ art = art/ant.spe art/ball.spe art/blowups.spe art/bold.spe \ - art/tints/guns/orange.spe art/tints/guns/redish.spe \ - addon/aliens/aliens.spe addon/aliens/bactiles.spe \ - addon/aliens/fortiles.spe addon/bong/bong.spe \ -- addon/claudio/antship.spe addon/claudio/bigexp.spe \ -- addon/claudio/deepw1.spe addon/claudio/deepw2.spe \ -- addon/claudio/droid.spe addon/claudio/extiles.spe \ -- addon/claudio/fire.spe addon/claudio/lamp.spe \ -- addon/claudio/lava2.spe addon/claudio/mypanels.spe \ -- addon/claudio/nplatfor.spe addon/claudio/pal21.spe \ -- addon/claudio/pal2.spe addon/claudio/pal5.spe \ -- addon/claudio/pal81f.spe addon/claudio/pal81.spe \ -- addon/claudio/pal82f.spe addon/claudio/pal82.spe \ -- addon/claudio/pal90.spe addon/claudio/rob2.spe \ -- addon/claudio/skull.spe addon/claudio/spaced.spe \ -- addon/claudio/spaceh.spe addon/claudio/spacymed.spe \ -- addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \ -- addon/claudio/t_lamp.spe addon/claudio/trex1.spe \ -- addon/claudio/t_skull.spe addon/claudio/t_space.spe \ -- addon/claudio/t_trex.spe addon/claudio/t_water.spe \ -- addon/claudio/umbrel3.spe addon/claudio/watem.spe \ - addon/example/example.spe addon/leon/gray.spe \ - addon/leon/level00.spe addon/leon/level01.spe \ - addon/leon/level02.spe addon/leon/lmisc.spe \ -@@ -333,7 +315,6 @@ demos = \ - doc = \ - addon/aliens/aliens.txt \ - addon/aliens/readme.txt \ -- addon/claudio/palettes.txt \ - addon/leon/leon.txt \ - addon/newart/tiledoc.txt \ - addon/pong/pong.txt \ -@@ -414,17 +395,6 @@ extra = \ - @HAVE_NONFREE_TRUE@ addon/aliens/aslash01.wav \ - @HAVE_NONFREE_TRUE@ addon/aliens/egghatch.wav \ - @HAVE_NONFREE_TRUE@ addon/aliens/jarbreak.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/aship.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/drill.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/fire.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/glass1.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/sewers.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/skull.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/spaceo.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/trex1.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/trex2.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/unhealth.wav \ --@HAVE_NONFREE_TRUE@ addon/claudio/wfall.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship1.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship2.wav \ - @HAVE_NONFREE_TRUE@ addon/leon/sfx/gren5.wav \ -diff --git a/data/abuse.lsp b/data/abuse.lsp -index cc09aa930..6b15f8dd2 100644 ---- a/data/abuse.lsp -+++ b/data/abuse.lsp -@@ -42,7 +42,6 @@ - (load "addon/twist/f2chars.lsp") - (load "addon/twist/f2ai.lsp") - (load "addon/aliens/astartup.lsp") --(load "addon/claudio/claudio.lsp") - (load "addon/twist/lisp/dray.lsp") - (load "addon/twist/lisp/mario.lsp") - (load "addon/leon/4frabs.lsp") -@@ -50,13 +49,11 @@ - - (setq bad_guy_list - (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER -- GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA -- ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT -+ GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT - ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD)) - (setq object_destroyable_list - (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER -- GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA -- ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT -+ GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT - ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD)) - - (gc) ;; garbage collection perm space -diff --git a/data/addon/deathmat/deathmat.lsp b/data/addon/deathmat/deathmat.lsp -index 3d5a78e77..5452ddad7 100644 ---- a/data/addon/deathmat/deathmat.lsp -+++ b/data/addon/deathmat/deathmat.lsp -@@ -28,7 +28,6 @@ - (load "lisp/switch.lsp") - - ;; Artwork from fRaBs --(load "addon/claudio/claudio.lsp") - (load "addon/aliens/astartup.lsp") - (load "addon/newart/newart.lsp") - (load "addon/leon/4frabsdm.lsp") -diff --git a/data/addon/newart/tiledoc.txt b/data/addon/newart/tiledoc.txt -index 5dbebea33..3f864353c 100644 ---- a/data/addon/newart/tiledoc.txt -+++ b/data/addon/newart/tiledoc.txt -@@ -21,8 +21,6 @@ NEW FOREGROUND TILES - /addon/newart/frabs_2.spe 1250-1285 - /addon/newart/final.spe 1300-1336 - /addon/aliens/fortiles.spe 2000-2077 --/addon/claudio/pal81f.spe 2200-2217 --/addon/claudio/pal82f.spe 2250-2283 - - REGULAR ABUSE BACKGROUND TILES - -@@ -38,11 +36,7 @@ REGULAR ABUSE BACKGROUND TILES - NEW BACKGROUND TILES - - /addon/aliens/bactiles.spe 340-374 --/addon/claudio/pal2.spe 380-387 --/addon/claudio/pal5.spe 430-444 - /addon/newart/space.spe 450-468 --/addon/claudio/pal90.spe 475-494 --/addon/claudio/pal21.spe 500-529 - /addon/newart/blcave.spe 560-574 - /addon/newart/frbsblue.spe 580-611 - -@@ -72,39 +66,16 @@ FOREGROUND DESCRIPTIONS - ;; Green cave foreground tiles used in - ;; the Aliens Abuse addon, by Michael Moss - --/addon/claudio/pal81f.spe 2200 --/addon/claudio/pal82f.spe 2250 --;; Out of all the addon tiles for Abuse, --;; Claudio Bolzoni's grey space ones just --;; stand out as the best. These were --;; numbered from 8100 in older versions of --;; fRaBs. -- - BACKGROUND DESCRIPTIONS - - /addon/aliens/bactiles.spe 340-374 - ;; Aliens Abuse background tiles. Have - ;; you ever played Doom? :) - --/addon/claudio/pal2.spe 380-387 --;; Metal sewer tiles also from Doom. -- --/addon/claudio/pal5.spe 430-444 --;; Limestone cave tiles! Very cool. --;; Also by Claudio. -- - /addon/newart/space.spe 450-468 - ;; Space tiles with planets. Thanks - ;; Cypress! - --/addon/claudio/pal90.spe 475-494 --;; Starry tiles. These were --;; numbered from 9000 in previous --;; versions of fRaBs. By Claudio. -- --/addon/claudio/pal21.spe 500-529 --;; Starry tiles by Claudio Bolzoni. -- - /addon/newart/blcave.spe 560-574 - ;; Blue caves. By Cypress. - -diff --git a/data/addon/twist/lisp/dray.lsp b/data/addon/twist/lisp/dray.lsp -index eba873f45..84c4e27e7 100644 ---- a/data/addon/twist/lisp/dray.lsp -+++ b/data/addon/twist/lisp/dray.lsp -@@ -9,7 +9,7 @@ - ;; make sure you add all the objects that the deathray's light beam will have effect on. - ;; the objects are simply the bad_guy_list... BUT, remove DARNEL from the list. - --(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR)) -+(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR)) - - - ;; this will allow the player to pick up both ammo and weapons. diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD deleted file mode 100644 index f9aca76..0000000 --- a/libre/antlr2/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# Maintainer (Arch): Andrea Scarpino -# Contributor (Arch): George Giorgidze -# Contributor (Arch): Stefan Husmann -# Maintainer: Omar Vega Ramos -# Contributor: Luke Shumaker - -pkgbase=antlr2 -pkgname=('antlr2' antlr2-{java,python2,cxx}) -pkgver=2.7.7 -pkgrel=9 -pkgrel+=.par1 -pkgdesc="Language recognition tool providing a framework to build grammatical parsers" -arch=('x86_64') -arch+=('i686' 'armv7h') -url="http://www.antlr2.org/" -license=('custom:Public Domain') -makedepends=('java-environment' 'python2' 'bash' 'jh') -options=('staticlibs') -source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz" - "https://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom" - 'runantlr2.sh' - 'gcc4.4.patch') -sha256sums=('853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9' - '100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7' - '04c5b1e4d1fef6fe31852ecba2c18313dfa9d9971ee317274ea964b6f658c255' - 'b37444f9867544b8c7ad498b0bface51de0b34af8ef88eb7e2b298f102a10b1b') - -prepare() { - cd "${srcdir}/antlr-${pkgver}" - patch -Np1 -i "${srcdir}"/gcc4.4.patch -} - -build() { - cd "${srcdir}/antlr-${pkgver}" - - ./configure --prefix=/usr \ - --disable-examples \ - --disable-csharp - make -} - -_install_license() { - install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_antlr2() { - depends=('bash' 'antlr2-java') - - install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2 - _install_license -} - -package_antlr2-java() { - pkgdesc+=" (Java version)" - depends=('java-runtime') - - provides=("java-antlr2=$pkgver") - conflicts=("java-antlr2") - replaces=("java-antlr2") - - DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \ - "$srcdir"/antlr-${pkgver}.pom \ - "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \ - antlr2.jar - - ln -s "/usr/share/java/antlr2.jar" \ - "${pkgdir}/usr/share/java/antlr2-${pkgver}.jar" - _install_license -} - -package_antlr2-python2() { - pkgdesc+=" (Python version)" - depends=('python2') - - provides=("python2-antlr2=$pkgver") - conflicts=("python2-antlr2") - replaces=("python2-antlr2") - - cd "$srcdir"/antlr-${pkgver}/lib/python - python2 setup.py install --root="${pkgdir}" --optimize=1 - - _install_license -} - -package_antlr2-cxx() { - pkgdesc+=" (C++ version)" - - cd "$srcdir"/antlr-${pkgver}/lib/cpp - make prefix="${pkgdir}/usr" install - - _install_license -} diff --git a/libre/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch deleted file mode 100644 index 15e25fb..0000000 --- a/libre/antlr2/gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp ---- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp -+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp -@@ -10,6 +10,8 @@ - - #include - -+#include -+#include - #include - - #ifdef HAS_NOT_CCTYPE_H diff --git a/libre/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh deleted file mode 100644 index d274e56..0000000 --- a/libre/antlr2/runantlr2.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export CLASSPATH="/usr/share/java/antlr2.jar${CLASSPATH:+:$CLASSPATH}" -java antlr.Tool "$@" diff --git a/libre/bfgminer/PKGBUILD b/libre/bfgminer/PKGBUILD deleted file mode 100644 index 6aad415..0000000 --- a/libre/bfgminer/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer (Arch): Christian Rebischke -# Contributor (Arch): Timothy Redaelli -# Contributor (Arch): Andy Weidenbaum -# Maintainer: Omar Vega Ramos -# Contributor: Márcio Silva - -# parabola changes and rationale: -# - replaced opencl-nvidia recommendation with opencl-mesa - -pkgname=bfgminer -pkgver=5.5.0 -pkgrel=3 -pkgrel+=.parabola1 -pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining" -pkgdesc+=", with opencl-mesa recommendation" -arch=('x86_64') -arch+=('i686' 'armv7h') -depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors') -makedepends=('uthash' 'yasm') -optdepends=('opencl-mesa: OpenCL implementation for AMD/ATI GPUs') -url='https://bitcointalk.org/?topic=877081' -license=('GPL3') -source=("https://luke.dashjr.org/programs/bitcoin/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.txz" - 'remove-dangerous-rpath.patch') -sha512sums=('d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb' - '087aa60d818ff37cb7a4edce7a34331a492b5e379a8e034d7a2e02b106bb6ea52b4ce6a1077f602987a2c30213bc185063990796a828ae95f60cff03c7a0bc3f') - -prepare() { - cd "${pkgname}"-"${pkgver}" - - patch -p1 -i "${srcdir}"/remove-dangerous-rpath.patch -} - -build() { - cd "${pkgname}"-"${pkgver}" - - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --enable-cpumining \ - --enable-bfsb \ - --enable-metabank \ - --enable-scrypt \ - --enable-opencl \ - --with-udevrulesdir=/usr/lib/udev/rules.d - # --enable-knc (FS#33640) - make -} - -package() { - cd "${pkgname}"-"${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/libre/bfgminer/remove-dangerous-rpath.patch b/libre/bfgminer/remove-dangerous-rpath.patch deleted file mode 100644 index 897aca5..0000000 --- a/libre/bfgminer/remove-dangerous-rpath.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur bfgminer-4.8.0-orig/configure bfgminer-4.8.0/configure ---- bfgminer-4.8.0-orig/configure 2014-10-04 20:54:28.717071865 -0400 -+++ bfgminer-4.8.0/configure 2014-10-04 20:55:50.140274445 -0400 -@@ -14111,7 +14111,7 @@ - ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - libbase58_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libbase58' -- libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,\$$ORIGIN/libbase58/.libs'"$origin_LDFLAGS"' -lbase58' -+ libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"' -lbase58' - libbase58_SUBDIRS=libbase58 - libbase58_EXTRADEPS=libbase58_directory - BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES -@@ -14380,7 +14380,7 @@ - ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - libblkmaker_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libblkmaker' -- libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"' -lblkmaker_jansson-0.1 -lblkmaker-0.1' -+ libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"' -lblkmaker_jansson-0.1 -lblkmaker-0.1' - libblkmaker_SUBDIRS=libblkmaker - libblkmaker_EXTRADEPS=libblkmaker_directory - BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES diff --git a/libre/digikam/PKGBUILD b/libre/digikam/PKGBUILD deleted file mode 100644 index 6acfb5c..0000000 --- a/libre/digikam/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id$ -# Maintainer (Arch): Ronald van Haren -# Maintainer (Arch): Antonio Rojas -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Tobias Powalowski -# Contributor: André Silva -# Contributor: Márcio Silva -# Contributor: jc_gargma - -pkgbase=digikam -pkgname=(kipi-plugins) -_pkgver=5.9.0 -pkgver=${_pkgver//-/_} # for beta versions -pkgrel=1 -pkgrel+=.parabola1 -pkgdesc="An advanced digital photo management application" -arch=(x86_64) -arch+=(i686 armv7h) -license=(GPL) -url="http://www.digikam.org/" -makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common - kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu) -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz") -source+=("libre.patch") -sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b' - '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89') - -prepare() { - mkdir -p build - -# fix freedom issues - cd $pkgbase-$_pkgver - patch -Np1 -i "$srcdir"/libre.patch -} - -build() { - cd build - - cmake ../$pkgbase-${_pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF \ - -DENABLE_KFILEMETADATASUPPORT=ON \ - -DENABLE_MEDIAPLAYER=ON \ - -DENABLE_AKONADICONTACTSUPPORT=ON \ - -DENABLE_MYSQLSUPPORT=ON \ - -DENABLE_OPENCV3=ON \ - -DENABLE_APPSTYLES=ON - make -} - -package_kipi-plugins() { - pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - pkgdesc+=", without nonfree suggestions" - depends=(kio libkipi) - optdepends=('libmediawiki: MediaWiki Export plugin' - 'libkvkontakte: VKontakte.ru Exporter plugin') - - cd build/extra - make DESTDIR="$pkgdir" install - cd $srcdir/build/po - make DESTDIR="$pkgdir" install - -# Provided by digikam - rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo -} diff --git a/libre/digikam/libre.patch b/libre/digikam/libre.patch deleted file mode 100644 index 8c677e2..0000000 --- a/libre/digikam/libre.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h -index 0f58cc4..b497299 100644 ---- a/extra/kipi-plugins/sendimages/emailsettings.h -+++ b/extra/kipi-plugins/sendimages/emailsettings.h -@@ -64,10 +64,9 @@ public: - CLAWSMAIL, - EVOLUTION, - KMAIL, -- NETSCAPE, - SYLPHEED, - SYLPHEEDCLAWS, -- THUNDERBIRD -+ ICEDOVE - }; - - enum ImageSize -diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp -index 1be65d6..68094de 100644 ---- a/extra/kipi-plugins/sendimages/sendimages.cpp -+++ b/extra/kipi-plugins/sendimages/sendimages.cpp -@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent() - // More info about command lines options with Mozilla & co: - // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules - -- case EmailSettings::NETSCAPE: -- case EmailSettings::THUNDERBIRD: -+ case EmailSettings::ICEDOVE: - { - QString prog; - -- if (d->settings.emailProgram == EmailSettings::NETSCAPE) -+ if (d->settings.emailProgram == EmailSettings::ICEDOVE) - { -- prog = QLatin1String("netscape"); -- } -- else -- { -- prog = QLatin1String("thunderbird"); -+ prog = QLatin1String("icedove"); - } - - QStringList args; -diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp -index b8416a4..f160310 100644 ---- a/extra/kipi-plugins/sendimages/settingswidget.cpp -+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp -@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent) - d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail")); - d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution")); - d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail")); -- d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape")); - d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed")); - d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws")); -- d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird")); -+ d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove")); - #endif - d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT); - d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. " diff --git a/libre/faenza-icon-theme/PKGBUILD b/libre/faenza-icon-theme/PKGBUILD deleted file mode 100644 index 9038ebb..0000000 --- a/libre/faenza-icon-theme/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# Maintainer (Arch): Daniel Micay -# Contributor (Arch): Elia Notarangelo -# Contributor (Arch): Frikilinux -# Contributor (Arch): graysky -# Contributor (Arch): Samsagax -# Contributor (Arch): simongmzlj -# Maintainer: André Silva -# Contributor: Jorge Araya Navarro -# Contributor: Márcio Silva - -pkgname=faenza-icon-theme -pkgver=1.3.1 -pkgrel=5 -pkgrel+=.par1 -pkgdesc='Icon theme designed for Equinox GTK theme' -pkgdesc+=', without nonfree distros and application icons (Parabola rebranded)' -url='http://gnome-look.org/content/show.php/Faenza?content=128143' -license=('GPL3') -arch=('any') -replaces=(${pkgname}-libre) -conflicts=(${pkgname}-libre) -makedepends=('librsvg') -options=(!strip) -source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz" - 'distributor-logo-parabola.svg' - 'start-here-parabola-symbolic.svg') -sha512sums=('0c017ddbaa2dba485341d3bb1e321fafad026aafc893fa2519ddfd3fe0475fc8d011c99ce3de581c9b1c6aa7d250312673dda7c10bb12783db2d45816646ddc9' - 'a6efee8dc521c3975033185eb8a7bf5d89e9a5a157f0f22e2cdee32d631bcaf0930e3a55dbfaf7e7ae2b5249d28895bd06c8957eb6139544b807e8494e601a41' - '8bcc02e44606af66908b8c377965f1df36341e7991544c7c89375dfa19d05abb8055280a8ec8038e889ba18aa3dd9ab8e5292c9c7c83fec8fac46bebedc3415e') - -prepare() { - cd "$srcdir/$pkgname-1.3" - rm -rv debian - - # remove nonfree distros and application logos - for nonfree in archlinux debian fedora frugalware gentoo linux-mint mandriva opensuse redhat slackware ubuntu flash rpmdrake novell skype; do - find -name *$nonfree* -delete - done - - # add the Parabola GNU/Linux-libre logos to the source code - cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable - cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable/start-here-parabola.svg - cp -a "$srcdir/start-here-parabola-symbolic.svg" Faenza/places/scalable - - for size in 22 24 32 48 64 96; do - rsvg-convert -w $size -h $size -o Faenza/places/$size/distributor-logo-parabola.png "$srcdir/distributor-logo-parabola.svg" - rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola.png "$srcdir/distributor-logo-parabola.svg" - rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola-symbolic.png "$srcdir/start-here-parabola-symbolic.svg" - - ln -sf Faenza/places/$size/distributor-logo-parabola.png Faenza/places/$size/parabola-logo.png - ln -sf Faenza/places/scalable/distributor-logo-parabola.svg parabola-logo.svg - ln -sf Faenza/places/scalable/start-here-parabola.svg Faenza-Dark/places/scalable/start-here-parabola.svg - ln -sf Faenza/places/scalable/start-here-parabola-symbolic.svg Faenza-Dark/places/scalable/start-here-parabola-symbolic.svg - done -} - -package() { - cd $pkgname-1.3 - mkdir -p "$pkgdir/usr/share/icons" "$pkgdir/usr/lib" "$pkgdir/usr/share" - - cp -rf Faenza{,-Dark,-Darkest,-Darker,-Ambiance,-Radiance} "$pkgdir/usr/share/icons/" - cp -rf rhythmbox "$pkgdir/usr/lib/" - cp -rf emesene "$pkgdir/usr/share/" - - # set the Parabola GNU/Linux-libre Distributor and start menu logo - for theme in Faenza{,-Dark}; do - for size in 22 24 32 48 64 96; do - cd "$pkgdir/usr/share/icons/$theme/places/$size/" - # no distributor-logo for Faenza-Dark - [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.png - ln -sf start-here{-parabola,}.png - done - cd "$pkgdir/usr/share/icons/$theme/places/scalable/" - # no distributor-logo for Faenza-Dark - [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.svg - ln -sf start-here{-parabola,}.svg - ln -sf start-here{-parabola-symbolic,-symbolic}.svg - done - - for theme in Faenza{,-Dark}; do - cd "$pkgdir/usr/share/icons/$theme/apps/scalable/" - ln -sf gnome-session-reboot.svg system-reboot.svg - for size in 16 22 24 32 48 64 96; do - cd "$pkgdir/usr/share/icons/$theme/apps/$size/" - ln -sf gnome-session-reboot.png system-reboot.png - done - done -} diff --git a/libre/faenza-icon-theme/distributor-logo-parabola.svg b/libre/faenza-icon-theme/distributor-logo-parabola.svg deleted file mode 100644 index dec339e..0000000 --- a/libre/faenza-icon-theme/distributor-logo-parabola.svg +++ /dev/null @@ -1,570 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libre/faenza-icon-theme/start-here-parabola-symbolic.svg b/libre/faenza-icon-theme/start-here-parabola-symbolic.svg deleted file mode 100644 index a70ad3b..0000000 --- a/libre/faenza-icon-theme/start-here-parabola-symbolic.svg +++ /dev/null @@ -1,738 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/libre/java-bcel/PKGBUILD b/libre/java-bcel/PKGBUILD deleted file mode 100644 index bb28750..0000000 --- a/libre/java-bcel/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Omar Vega Ramos -_libname=bcel -pkgname=java-${_libname} -pkgver=6.0 -pkgrel=1.parabola1 -pkgdesc="Java library to analyze, create, and manipulate (binary) Java class files" -arch=('any') -url='https://commons.apache.org/proper/commons-bcel/' -license=('APACHE') -depends=('java-runtime') -makedepends=('java-environment' 'jh') -source=("http://archive.apache.org/dist/jakarta/${_libname}/source/${_libname}-$pkgver-src.tar.gz") -sha256sums=('b963b9f0614f17de40da1de265e44476b80a8cc8a36c07a3acfe48f603306958') - -prepare() { - cd "$srcdir/${_libname}-$pkgver-src" - mkdir -p build/classes -} - -build() { - cd "$srcdir/${_libname}-$pkgver-src" - javac -d build/classes -encoding UTF-8 \ - $(find src/main/java -name \*.java) - javadoc -sourcepath src/main/java -d build/javadoc \ - -encoding UTF-8 -subpackages org - - jar -cvf "${_libname}.jar" -C build/classes . -} - -package() { - cd "$srcdir/${_libname}-$pkgver-src" - - # Install license file - install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" - - # Install documentation - install -d "$pkgdir/usr/share/doc/$pkgname" - cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname" - - # Install Maven artifacts - export DESTDIR=$pkgdir - jh mvn-install "org.apache.${_libname}" ${_libname} $pkgver \ - pom.xml "${_libname}.jar" "${_libname}.jar" - - ln -s "/usr/share/java/${_libname}.jar" \ - "$pkgdir/usr/share/java/${_libname}-$pkgver.jar" -} diff --git a/libre/java-commons-net1/PKGBUILD b/libre/java-commons-net1/PKGBUILD deleted file mode 100644 index b17eb96..0000000 --- a/libre/java-commons-net1/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Maintainer (Arch): Guillaume ALAUX -# Maintainer: Omar Vega Ramos - -_libname=commons-net -pkgname=java-${_libname}1 -pkgver=1.4.1 -pkgrel=3.parabola1 -pkgdesc="Apache library that implements the client side of many basic Internet protocols" -arch=('any') -url="http://commons.apache.org/net/" -license=('APACHE') -depends=('java-runtime-headless') -makedepends=('apache-ant' 'jakarta-oro' 'jh') -source=("https://archive.apache.org/dist/commons/net/source/${_libname}-${pkgver}-src.tar.gz") -sha512sums=('6ac697536eff947cd0aa828c887e9cc4046c49a593c760bbc59db7e04cf0d7456e84d22504cfa2f6915315dc061e3499382f05bd7740bf79a532a4d9d42c0da8') - -build() { - cd "${srcdir}/${_libname}-${pkgver}" - ant dist -Dnoget=true -lib "/usr/share/java/jakarta-oro.jar" -} - -package() { - cd "${srcdir}/${_libname}-${pkgver}" - - # Install license file - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "dist/docs/api" "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "src/java/examples" "${pkgdir}/usr/share/doc/${pkgname}/examples" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install ${_libname} ${_libname} ${pkgver} \ - "${srcdir}/${_libname}-${pkgver}/project.xml" \ - "${srcdir}/${_libname}-${pkgver}/target/${_libname}-${pkgver}.jar" \ - "${_libname}.jar" - ln -s "/usr/share/java/${_libname}.jar" \ - "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar" -} diff --git a/libre/jedit/PKGBUILD b/libre/jedit/PKGBUILD deleted file mode 100644 index 017187d..0000000 --- a/libre/jedit/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# Maintainer: Omar Vega Ramos - -pkgname=jedit -pkgver=5.4.0 -pkgrel=5.parabola1 -pkgdesc='Editor for programmers' -arch=('any') -url='http://jedit.org/' -license=('GPL') -depends=('java-runtime>=8') -makedepends=('java-environment=8' 'apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell' 'docbook-xsl-saxon' - 'gendesk' 'java-hamcrest' 'jsr305' 'junit' 'xerces2-java') -optdepends=('noto-fonts: usable font') -options=('!emptydirs') -source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/jedit${pkgver}source.tar.bz2" - 'jedit.sh' 'jeditbg.sh' 'jedit.props' 'jedit-fix_build.patch') -sha256sums=('b42dec6c81936b8974308f03c8f356487586cec782d79659b8ae67953c8edf71' - '91d9b4b0c4855c9624ceea8c6b40c90b53fb15a020b6d954f4bb6b4b934e0348' - '5cf267b6ee1f908ee7e9a830dc98f03a3a4a53db2822fce6a2cb5ed02d444c69' - 'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347' - '1d747fb3d4b0d4af3d3e752d92858067e02e8160d4d22cf820bd9f45c0fff90b') - -prepare() { - gendesk -f -n \ - --pkgname "$pkgname" \ - --pkgdesc "$pkgdesc" \ - --exec 'jeditbg %U' \ - --name jEdit \ - --genericname Editor - - cd jEdit - mkdir -p lib/{ant-contrib,compile,docbook,ivy,default-plugins,scripting,test} - ln -sf /usr/share/java/ant-contrib.jar lib/ant-contrib/ant-contrib.jar - ln -sf /usr/share/java/apache-ivy/ivy.jar lib/ivy/ivy.jar - ln -sf /usr/share/java/bsh.jar lib/ant-contrib/bsh.jar - ln -sf /usr/share/java/docbook-xsl-saxon.jar lib/docbook/docbook-xsl-saxon.jar - ln -sf /usr/share/java/saxon.jar lib/docbook/saxon.jar - ln -sf /usr/share/java/xercesImpl.jar lib/docbook/xercesImpl.jar - ln -sf /usr/share/java/hamcrest-core.jar lib/test/hamcrest-core.jar - ln -sf /usr/share/java/hamcrest-library.jar lib/test/hamcrest-library.jar - ln -sf /usr/share/java/jsr305.jar lib/compile/jsr305.jar - ln -sf /usr/share/java/junit.jar lib/test/junit.jar - patch -Np1 -i "${srcdir}/jedit-fix_build.patch" -} - -build() { - cd jEdit - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk - ant build docs-html \ - -Divy.done=true -} - -package() { - cd jEdit - - # Install documentation - install -d "$pkgdir/usr/share/java/$pkgname" - cp -r build/doc "$pkgdir/usr/share/java/$pkgname" - - # Install jars - install -D -m644 build/$pkgname.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" - - # Install keymaps - cp -r build/keymaps "${pkgdir}/usr/share/java/${pkgname}" - - # Install macros - cp -r build/macros "${pkgdir}/usr/share/java/${pkgname}" - - # Install modes - cp -r build/modes "${pkgdir}/usr/share/java/${pkgname}" - - # Install properties - cp -r build/properties "${pkgdir}/usr/share/java/${pkgname}" - - # Install startup - cp -r build/startup "${pkgdir}/usr/share/java/${pkgname}" - - # Man pages - install -Dm644 package-files/linux/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" - - install -d "$pkgdir/usr/bin" - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm755 "$srcdir/${pkgname}bg.sh" "$pkgdir/usr/bin/${pkgname}bg" - install -Dm644 "$srcdir/$pkgname.props" "$pkgdir/usr/share/$pkgname/default.props" - install -Dm644 doc/$pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" -} diff --git a/libre/jedit/jedit-fix_build.patch b/libre/jedit/jedit-fix_build.patch deleted file mode 100644 index 15d2da7..0000000 --- a/libre/jedit/jedit-fix_build.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- jEdit.orig/build.xml 2015-10-20 12:56:08.000000000 -0500 -+++ jEdit/build.xml 2016-07-02 10:14:37.488512109 -0500 -@@ -119,7 +119,7 @@ - - - - -- - - - -@@ -660,9 +657,9 @@ - - - -+ location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/html/chunk.xsl"/> - -+ location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/docbook.xsl"/> - - diff --git a/libre/jedit/jedit.props b/libre/jedit/jedit.props deleted file mode 100644 index a712b96..0000000 --- a/libre/jedit/jedit.props +++ /dev/null @@ -1,63 +0,0 @@ -# --- Arch Linux defaults for jEdit --- -# -# Just remove this file (~/.jedit/properties) to use the original jEdit defaults. -# -# startup -firstTime=false -tip.show=false -# buffers -buffer.tabSize=4 -buffer.indentSize=4 -buffer.encoding=UTF-8 -buffer.maxLineLen=99 -# look and feel, fonts and colors -icon-theme=tango -lookAndFeel=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -view.fontsize=14 -view.font=Noto Mono -view.selectionFg=false -view.antiAlias=standard -view.caretColor=\#333333 -view.lineHighlightColor=\#deebfb -view.thickCaret=false -view.selectionFgColor=\#000000 -view.extendedState=0 -view.wrapGuideColor=\#dedede -view.structureHighlightColor=\#3d9bc4 -view.selectionColor=\#cccccc -view.status.show-caret-virtual=true -view.status.foreground=\#000000 -view.status.show-caret-linenumber=true -view.status.show-caret-bufferlength=true -view.status.background=\#ffffff -view.status.show-caret-dot=true -view.status.memory.background=\#66699a -view.status.show-caret-offset=true -view.style.invalid=color\:\#ff1e00 bgColor\:\#ffffcc -view.style.digit=color\:\#330066 -view.style.literal4=color\:\#0182bc -view.style.literal3=color\:\#0700cc -view.style.literal2=color\:\#760000 -view.style.literal1=color\:\#90001c -view.style.comment4=color\:\#a2a2a2 -view.style.label=color\:\#009500 -view.style.comment3=color\:\#868686 -view.style.comment2=color\:\#383838 -view.style.comment1=color\:\#434343 -view.style.keyword4=color\:\#00a228 -view.style.keyword3=color\:\#0b2700 -view.style.keyword2=color\:\#000066 -view.style.keyword1=color\:\#0033cc -view.style.function=color\:\#006600 -view.style.operator=color\:\#000000 -view.gutter.fontsize=14 -view.gutter.font=Courier 10 Pitch -view.gutter.highlightColor=\#660000 -view.gutter.selectionAreaBgColor=\#f0f0f0 -view.gutter.highlightInterval=10 -view.gutter.focusBorderColor=\#ececec -view.gutter.highlightCurrentLine=false -view.gutter.bgColor=\#f0f0f0 -view.gutter.currentLineColor=\#006699 -view.gutter.fgColor=\#3c3c3c -view.gutter.selectionAreaWidth=12 diff --git a/libre/jedit/jedit.sh b/libre/jedit/jedit.sh deleted file mode 100644 index df16cfa..0000000 --- a/libre/jedit/jedit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Runs jEdit - Programmer's Text Editor - -# If both $HOME/.jedit and $HOME/.jedit/properties doesn't exist, -# copy in a default property file. -if [ ! -e $HOME/.jedit ]; then - if [ ! -e $HOME/.jedit/properties ]; then - mkdir -p "$HOME/.jedit" - cp "/usr/share/jedit/default.prop"s "$HOME/.jedit/properties" - fi -fi - -# Set the initial and maximum JVM heap size -JAVA_HEAP_MAX_SIZE=192 - -# Start jEdit -exec java -Xmx${JAVA_HEAP_MAX_SIZE}M -Dawt.useSystemAAFontSettings=lcd -jar "/usr/share/java/jedit/jedit.jar" "$@" diff --git a/libre/jedit/jeditbg.sh b/libre/jedit/jeditbg.sh deleted file mode 100644 index f4d08ed..0000000 --- a/libre/jedit/jeditbg.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -# Runs jEdit in background-mode, ready to reuse the running instance -jedit -background -reuseview "$@" diff --git a/libre/libquicktime/PKGBUILD b/libre/libquicktime/PKGBUILD deleted file mode 100644 index b550188..0000000 --- a/libre/libquicktime/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# Maintainer (Arch): David Runge -# Contributor (Arch): Federico Cinelli -# Contributor (Arch): Mateusz Herych -# Maintainer: Omar Vega Ramos -# Contributor: Jorge Lopez - -pkgname=libquicktime -pkgver=1.2.4 -pkgrel=22 -pkgrel+=.parabola1 -pkgdesc="A library for reading and writing quicktime files" -pkgdesc+=", without nonfree faac support" -arch=('x86_64') -arch+=('i686' 'armv7h') -license=('LGPL2.1') -url="http://libquicktime.sourceforge.net/" -depends=('glib2' 'glibc' 'zlib') -makedepends=('alsa-lib' 'faad2' 'ffmpeg' 'gtk2' 'lame' 'libdv' -'libglvnd' 'libjpeg-turbo' 'libvorbis' 'libx11' 'libxaw' 'libxext' 'libxt' -'libxv' 'schroedinger' 'sndio' 'x264') -optdepends=('alsa-lib: for lqtplay' - 'ffmpeg: for lqt_ffmpeg plugin' - 'gtk2: for libquicktime_config' - 'lame: for lqt_lame plugin' - 'libdv: for lqt_dv plugin' - 'libglvnd: for lqtplay' - 'libjpeg-turbo: for lqt_mjpeg plugin' - 'libpng: for lqt_png plugin' - 'libvorbis: for lqt_lame and lqt_vorbis plugin' - 'libx11: for lqtplay' - 'libxaw: for lqtplay' - 'libxext: for lqtplay' - 'libxt: for lqtplay' - 'libxv: for lqtplay' - 'schroedinger: for lqt_schroedinger plugin' - 'sndio: for lqtplay' - 'x264: for lqt_x264 plugin') -provides=('libquicktime.so') -source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "${pkgname}-1.2.4-CVE-2016-2399.patch" - "${pkgname}-1.2.4-CVE-2017-9122_et_al.patch" - "${pkgname}-1.2.4-faad2.patch" - "${pkgname}-1.2.4-ffmpeg2.patch" - "${pkgname}-1.2.4-ffmpeg29.patch" - "${pkgname}-1.2.4-ffmpeg4.patch" - "${pkgname}-1.2.4-ffmpeg-codecs.patch" - "${pkgname}-1.2.4-libavutil.patch") -sha512sums=('6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd' - '759fee13bc96db036063efcd8288c0e467ce811b597cf6c0ceed1c8927593963174f4f3324512db0e773e936a4b9fe5c8d8fc9e0f00b2ce59110661175986f9c' - '93639d3fe12eefddd1b457be702ec0a4a64a73c44fce6b3134e50bb9a4e7e5f25d256d3ace6ec5e774f2db4c0d68725f3e35e901f7d932a4be9cba566eab528e' - '3e751330ebbc4026363efd45b21c60c313ea169a57a5cdfa46125e126aab34c2dea3629ce92e7b0b5f14693db4f11723177fd28611e2e979cc8fcd506077509e' - '32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d' - '2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e' - '1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8' - '20c535444de1f3e9a68c35ee4eb409f150e6340fd43dda4544791454f42c031b24c08f651e0351f5a22dcb59459ac372aa70d82a1d20482b2d997589e19087fd' - '691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e') - -replaces=("${pkgname}-libre" "${pkgname}-parabola") -conflicts=("${pkgname}-libre" "${pkgname}-parabola") - -prepare() { - cd "$pkgname-$pkgver" - # boatload of CVEs: http://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=libquicktime - patch -Np1 -i "../${pkgname}-1.2.4-CVE-2016-2399.patch" - patch -Np1 -i "../${pkgname}-1.2.4-CVE-2017-9122_et_al.patch" - # checks for faad2 are broken in configure.ac - patch -Np1 -i "../${pkgname}-1.2.4-faad2.patch" - # ffmpeg compatibility is very ancient - patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg2.patch" - patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg29.patch" - patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg4.patch" - patch -Np1 -i "../${pkgname}-1.2.4-libavutil.patch" - patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg-codecs.patch" - autoreconf -vfi -} - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --enable-gpl \ - --with-ffmpeg \ - --with-libdv \ - --with-x264 \ - --without-doxygen \ - --without-faac - make -} - -package() { - depends+=('libfaad.so') - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -vDm 644 {AUTHORS,ChangeLog,README,TODO} \ - -t "${pkgdir}/usr/share/doc/${pkgname}" -} diff --git a/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch b/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch deleted file mode 100644 index a1737c0..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399 - -diff --git a/src/util.c b/src/util.c -index d8dc3c3..9422fc5 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file) - - void quicktime_read_pascal(quicktime_t *file, char *data) - { -- char len = quicktime_read_char(file); -- quicktime_read_data(file, (uint8_t*)data, len); -- data[(int)len] = 0; -+ int len = quicktime_read_char(file); -+ if ((len > 0) && (len < 256)) { -+ /* data[] is expected to be 256 bytes long */ -+ quicktime_read_data(file, (uint8_t*)data, len); -+ data[len] = 0; -+ } else { -+ data[0] = 0; -+ } - } - - void quicktime_write_pascal(quicktime_t *file, char *data) diff --git a/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch b/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch deleted file mode 100644 index 06fb7b3..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch +++ /dev/null @@ -1,151 +0,0 @@ -From: Burkhard Plaum -Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706 - -Hi, - -I committed some (mostly trivial) updates to CVS. The following CVE's -are fixed and/or no longer reproducible: - -CVE-2017-9122 -CVE-2017-9123 -CVE-2017-9124 -CVE-2017-9125 -CVE-2017-9126 -CVE-2017-9127 -CVE-2017-9128 - -I was a bit surprised that one simple sanity check fixes a whole bunch of files. - -So it could be, that the problems are still there, but better hidden since the -critical code isn't executed anymore with the sample files I got. - -If someone encounters more crashes, feel free to report them. - -Burkhard - ---- a/include/lqt_funcprotos.h -+++ b/include/lqt_funcprotos.h -@@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t - int quicktime_write_char32(quicktime_t *file, char *string); - float quicktime_read_fixed16(quicktime_t *file); - int quicktime_write_fixed16(quicktime_t *file, float number); --unsigned long quicktime_read_uint32(quicktime_t *file); --long quicktime_read_int32(quicktime_t *file); --long quicktime_read_int32_le(quicktime_t *file); -+uint32_t quicktime_read_uint32(quicktime_t *file); -+int32_t quicktime_read_int32(quicktime_t *file); -+int32_t quicktime_read_int32_le(quicktime_t *file); - int64_t quicktime_read_int64(quicktime_t *file); - int64_t quicktime_read_int64_le(quicktime_t *file); - long quicktime_read_int24(quicktime_t *file); ---- a/src/atom.c -+++ b/src/atom.c -@@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime - atom->size = read_size64(header); - atom->end = atom->start + atom->size; - } -+/* Avoid broken files */ -+ if(atom->end > file->total_length) -+ result = 1; - } - - ---- a/src/lqt_quicktime.c -+++ b/src/lqt_quicktime.c -@@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil - quicktime_set_position(file, start_position); - free(temp); - -- quicktime_read_moov(file, &file->moov, &leaf_atom); -- got_header = 1; -+ if(!quicktime_read_moov(file, &file->moov, &leaf_atom)) -+ got_header = 1; - } - else - quicktime_atom_skip(file, &leaf_atom); ---- a/src/moov.c -+++ b/src/moov.c -@@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil - if(quicktime_atom_is(&leaf_atom, "trak")) - { - quicktime_trak_t *trak = quicktime_add_trak(file); -- quicktime_read_trak(file, trak, &leaf_atom); -+ if(quicktime_read_trak(file, trak, &leaf_atom)) -+ return 1; - } - else - if(quicktime_atom_is(&leaf_atom, "udta")) ---- a/src/trak.c -+++ b/src/trak.c -@@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil - else quicktime_atom_skip(file, &leaf_atom); - } while(quicktime_position(file) < trak_atom->end); - -+ /* Do some sanity checks to prevent later crashes */ -+ if(trak->mdia.minf.is_video || trak->mdia.minf.is_video) -+ { -+ if(!trak->mdia.minf.stbl.stsc.table || -+ !trak->mdia.minf.stbl.stco.table) -+ return 1; -+ } -+ - #if 1 - if(trak->mdia.minf.is_video && - quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac")) ---- a/src/util.c -+++ b/src/util.c -@@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t - return quicktime_write_data(file, data, 2); - } - --unsigned long quicktime_read_uint32(quicktime_t *file) -+uint32_t quicktime_read_uint32(quicktime_t *file) - { -- unsigned long result; -- unsigned long a, b, c, d; -+ uint32_t result; -+ uint32_t a, b, c, d; - uint8_t data[4]; - - quicktime_read_data(file, data, 4); -@@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic - return result; - } - --long quicktime_read_int32(quicktime_t *file) -+int32_t quicktime_read_int32(quicktime_t *file) - { -- unsigned long result; -- unsigned long a, b, c, d; -+ uint32_t result; -+ uint32_t a, b, c, d; - uint8_t data[4]; - - quicktime_read_data(file, data, 4); -@@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *f - d = data[3]; - - result = (a << 24) | (b << 16) | (c << 8) | d; -- return (long)result; -+ return (int32_t)result; - } - --long quicktime_read_int32_le(quicktime_t *file) -+int32_t quicktime_read_int32_le(quicktime_t *file) - { -- unsigned long result; -- unsigned long a, b, c, d; -+ uint32_t result; -+ uint32_t a, b, c, d; - uint8_t data[4]; - - quicktime_read_data(file, data, 4); -@@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t - d = data[3]; - - result = (d << 24) | (c << 16) | (b << 8) | a; -- return (long)result; -+ return (int32_t)result; - } - - int64_t quicktime_read_int64(quicktime_t *file) diff --git a/libre/libquicktime/libquicktime-1.2.4-faad2.patch b/libre/libquicktime/libquicktime-1.2.4-faad2.patch deleted file mode 100644 index 563f464..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-faad2.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2012-03-29 21:44:28.000000000 +0200 -+++ b/configure.ac 2020-02-09 18:27:31.599127781 +0100 -@@ -728,82 +728,9 @@ - - if test "x$with_faad2" != "xno"; then - --OLD_CFLAGS=$CFLAGS --OLD_LIBS=$LIBS -- - CFLAGS="$CFLAGS" - LIBS="$LIBS -lfaad -lm" - --AC_MSG_CHECKING(for neaacdec.h usability for faad2) -- -- --AC_TRY_RUN([ -- #include -- #include -- main() -- { -- int faad_major; -- int faad_minor; -- faacDecHandle dec; -- -- if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2) -- return -1; -- dec = faacDecOpen(); -- if(!dec) -- return -1; -- return 0; -- } -- ], -- [ -- # program could be run -- have_faad2="true" -- AC_MSG_RESULT(yes) -- FAAD2_CFLAGS=$CFLAGS -- FAAD2_LIBS=$LIBS -- AC_DEFINE(HAVE_NEAACDEC_H) -- ], -- # program could not be run -- AC_MSG_RESULT(no) --) -- --if test "x$have_faad2" != "xtrue"; then -- --AC_MSG_CHECKING(for faad.h usability for faad2) -- --AC_TRY_RUN([ -- #include -- #include -- main() -- { -- int faad_major; -- int faad_minor; -- faacDecHandle dec; -- -- if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2) -- return -1; -- dec = faacDecOpen(); -- if(!dec) -- return -1; -- return 0; -- } -- ], -- [ -- # program could be run -- have_faad2="true" -- AC_MSG_RESULT(yes) -- FAAD2_CFLAGS=$CFLAGS -- FAAD2_LIBS=$LIBS -- -- -- ], -- # program could not be run -- AC_MSG_RESULT(no) --) -- --fi -- --CFLAGS=$OLD_CFLAGS --LIBS=$OLD_LIBS - - fi - diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch deleted file mode 100644 index 8de9a28..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch +++ /dev/null @@ -1,651 +0,0 @@ -diff -ruN a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c ---- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.000000000 +0200 -+++ b/plugins/ffmpeg/audio.c 2020-02-09 19:08:03.716063846 +0100 -@@ -626,7 +626,7 @@ - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +695,7 @@ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +806,7 @@ - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +866,8 @@ - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +909,7 @@ - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +986,7 @@ - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +995,7 @@ - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1495,9 +1495,9 @@ - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; -diff -ruN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c ---- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 -+++ b/plugins/ffmpeg/lqt_ffmpeg.c 2020-02-09 19:07:17.929831925 +0100 -@@ -386,7 +386,7 @@ - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -397,7 +397,7 @@ - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -415,7 +415,7 @@ - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -426,7 +426,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -453,7 +453,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -468,7 +468,7 @@ - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -481,7 +481,7 @@ - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -493,7 +493,7 @@ - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -508,7 +508,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -519,7 +519,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -533,7 +533,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -544,7 +544,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -555,7 +555,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -566,7 +566,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -580,7 +580,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -594,7 +594,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -606,7 +606,7 @@ - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -617,7 +617,7 @@ - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -627,7 +627,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -638,7 +638,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -648,7 +648,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -658,7 +658,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -669,7 +669,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -680,7 +680,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -693,7 +693,7 @@ - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -751,7 +751,7 @@ - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -772,7 +772,7 @@ - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -817,7 +817,7 @@ - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -839,7 +839,7 @@ - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -851,7 +851,7 @@ - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -866,7 +866,7 @@ - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -881,7 +881,7 @@ - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -896,7 +896,7 @@ - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -909,7 +909,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -922,7 +922,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -diff -ruN a/plugins/ffmpeg/video.c b/plugins/ffmpeg/video.c ---- a/plugins/ffmpeg/video.c 2012-02-25 20:46:56.000000000 +0100 -+++ b/plugins/ffmpeg/video.c 2020-02-09 19:07:44.399580606 +0100 -@@ -400,7 +400,7 @@ - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which - we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -@@ -438,7 +438,7 @@ - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { - /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 - and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -@@ -728,13 +728,13 @@ - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -947,15 +947,15 @@ - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1340,7 +1340,7 @@ - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,7 +1391,7 @@ - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { -@@ -1402,11 +1402,11 @@ - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1558,12 +1558,12 @@ - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch deleted file mode 100644 index 7add442..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch +++ /dev/null @@ -1,98 +0,0 @@ -Extracted from upstream CVS. -https://bugs.gentoo.org/show_bug.cgi?id=476498 - -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -101,6 +101,17 @@ typedef struct - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch deleted file mode 100644 index 96a323a..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch +++ /dev/null @@ -1,287 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ typedef struct - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ typedef struct - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co - /* First we try codec-specific colormodel matching. */ - if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co - - if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ static void convert_image_decode(quickti - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, diff --git a/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch deleted file mode 100644 index eb196ea..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch +++ /dev/null @@ -1,342 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c -+++ libquicktime-1.2.4/plugins/ffmpeg/audio.c -@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = codec->chunk_buffer; -- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - frame_bytes = avcodec_decode_audio4(codec->avctx, &f, -@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - codec->chunk_buffer, -- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); - if(frame_bytes < 0) - { - lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); -@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi - return 0; - } - -- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) -+ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) - { -- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; - codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); - } - memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, -- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - num_samples = mph.samples_per_frame; - codec->bytes_in_chunk_buffer = mph.frame_bytes; - } -@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi - { - - -- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size -+ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size - because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ -@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi - - #if DECODE_AUDIO3 || DECODE_AUDIO4 - codec->pkt.data = &codec->chunk_buffer[bytes_used]; -- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; -+ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; - - #if DECODE_AUDIO4 - -@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi - (codec->sample_buffer_end - codec->sample_buffer_start)], - &bytes_decoded, - &codec->chunk_buffer[bytes_used], -- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); -+ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); - #endif - if(frame_bytes < 0) - { -@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi - } - } - -- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ -+ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ - - if(codec->bytes_in_chunk_buffer < 0) - codec->bytes_in_chunk_buffer = 0; -Index: libquicktime-1.2.4/plugins/ffmpeg/params.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c -+++ libquicktime-1.2.4/plugins/ffmpeg/params.c -@@ -124,16 +124,6 @@ typedef struct - } - - --enum_t me_method[] = -- { -- { "Zero", ME_ZERO }, -- { "Phods", ME_PHODS }, -- { "Log", ME_LOG }, -- { "X1", ME_X1 }, -- { "Epzs", ME_EPZS }, -- { "Full", ME_FULL } -- }; -- - enum_t prediction_method[] = - { - { "Left", FF_PRED_LEFT }, -@@ -163,15 +153,6 @@ enum_t mb_decision[] = - { "Rate distoration", FF_MB_DECISION_RD } - }; - --enum_t coder_type[] = -- { -- { "VLC", FF_CODER_TYPE_VLC }, -- { "Arithmetic", FF_CODER_TYPE_AC }, -- { "Raw", FF_CODER_TYPE_RAW }, -- { "RLE", FF_CODER_TYPE_RLE }, -- { "Deflate", FF_CODER_TYPE_DEFLATE }, -- }; -- - #define PARAM_ENUM(name, var, arr) \ - if(!strcasecmp(key, name)) \ - { \ -@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); - PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); -- PARAM_ENUM("ff_me_method",me_method,me_method); -+ PARAM_DICT_INT("ff_me_method","motion-est"); - PARAM_INT("ff_gop_size",gop_size); - PARAM_FLOAT("ff_qcompress",qcompress); - PARAM_FLOAT("ff_qblur",qblur); -@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_rc_min_rate",rc_min_rate); - PARAM_INT("ff_rc_max_rate",rc_max_rate); - PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); -- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); - PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); - PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); -- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); -+ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); - PARAM_FLOAT("ff_lumi_masking",lumi_masking); - PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); - PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); -@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_me_range",me_range); - PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); - PARAM_INT("ff_scenechange_threshold",scenechange_threshold); -- PARAM_QP2LAMBDA("ff_lmin", lmin); -- PARAM_QP2LAMBDA("ff_lmax", lmax); -+ PARAM_DICT_INT("ff_lmin", "lmin"); -+ PARAM_DICT_INT("ff_lmax", "lmax"); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); - -@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - #endif - - PARAM_INT("ff_thread_count",thread_count); -- PARAM_INT("ff_me_threshold",me_threshold); -- PARAM_INT("ff_mb_threshold",mb_threshold); - PARAM_INT("ff_nsse_weight",nsse_weight); -- PARAM_FLOAT("ff_border_masking",border_masking); -+ PARAM_DICT_INT("ff_border_masking","border_mask"); - PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); - PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); - PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); - PARAM_INT("ff_bidir_refine",bidir_refine); - PARAM_INT("ff_brd_scale",brd_scale); -- PARAM_INT("ff_scenechange_factor",scenechange_factor); -- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); -- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); -- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); -- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); -- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); -+ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); -+ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); -+ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); -+ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); -+ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); - // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused -- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); -- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); -- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); -+ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); -+ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); - // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); - #else - PARAM_INT("ff_trellis",trellis); - #endif -- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); -- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); -+ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); -+ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused - - #if LIBAVCODEC_VERSION_MAJOR >= 55 -@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); - PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); - #else -- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); -- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); -+ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); - #endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 -@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_DICT_FLAG("ff_flag_obmc","obmc"); - PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); - #else -- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); -- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); -- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); -+ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); -+ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); -+ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); - #endif - -- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); -- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); -- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_ENUM("ff_coder_type",coder_type,coder_type); -+ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); -+ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); -+ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); -+ PARAM_DICT_INT("ff_coder_type","coder"); - - } -Index: libquicktime-1.2.4/plugins/ffmpeg/params.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h -+++ libquicktime-1.2.4/plugins/ffmpeg/params.h -@@ -149,7 +149,7 @@ the reference. Unused for constant quant - .type = LQT_PARAMETER_INT, \ - .val_default = { .val_int = 0 }, \ - .val_min = { .val_int = 0 }, \ -- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ -+ .val_max = { .val_int = 16 }, \ - .help_string = TRS("Maximum number of B-frames between non B-frames") \ - } - -Index: libquicktime-1.2.4/plugins/ffmpeg/video.c -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c -+++ libquicktime-1.2.4/plugins/ffmpeg/video.c -@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick - if(extradata) - { - codec->extradata = -- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); -+ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); - memcpy(codec->extradata, extradata, extradata_size); - codec->avctx->extradata_size = extradata_size; - codec->avctx->extradata = codec->extradata; -@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t - codec->avctx->qmin = 1; - codec->avctx->qmax = 3; - codec->avctx->rtp_payload_size = 1; // ?? -- codec->avctx->rc_buffer_aggressivity = 0.25; -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; -+ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; - - #if (LIBAVCODEC_VERSION_MAJOR < 54) - codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; -@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick - // codec->avctx->time_base.den = 1; - // codec->avctx->time_base.num = lqt_video_time_scale(file, track); - -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->avctx->global_quality = codec->qscale; - - codec->avctx->width = width; -@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - -@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick - { - lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); - codec->avctx->flags |= -- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); -+ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); - } - #endif - } -@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - codec->write_global_header = 1; - } - } -@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; -+ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; - } - } - else if(codec->is_imx) -@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick - if(codec->pass == 1) - { - codec->stats_file = fopen(codec->stats_filename, "w"); -- codec->avctx->flags |= CODEC_FLAG_PASS1; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; - } - else if(codec->pass == codec->total_passes) - { -@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick - fclose(codec->stats_file); - codec->stats_file = (FILE*)0; - -- codec->avctx->flags |= CODEC_FLAG_PASS2; -+ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; - } - } - /* Open codec */ -@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick - } - - codec->frame->pts = vtrack->timestamp; -- if(codec->avctx->flags & CODEC_FLAG_QSCALE) -+ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) - codec->frame->quality = codec->qscale; - #ifdef DO_INTERLACE - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) -@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick - else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; -- if(codec->avctx->max_b_frames || -- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) -+ if(codec->avctx->max_b_frames) - advanced = 1; - - setup_header_mpeg4(file, track, codec->avctx->extradata, diff --git a/libre/libquicktime/libquicktime-1.2.4-libavutil.patch b/libre/libquicktime/libquicktime-1.2.4-libavutil.patch deleted file mode 100644 index 99a4d39..0000000 --- a/libre/libquicktime/libquicktime-1.2.4-libavutil.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h -=================================================================== ---- libquicktime-1.2.4.orig/plugins/ffmpeg/ffmpeg.h -+++ libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h -@@ -27,6 +27,7 @@ - - #include - #include AVCODEC_HEADER -+#include - - void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec, - quicktime_video_map_t *vtrack, diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD deleted file mode 100644 index d360d18..0000000 --- a/libre/mcomix/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer (Arch): schuay -# Contributor (Arch): Ray Powell -# Maintainer (Hyperbola): André Silva -# Maintainer: Omar Vega Ramos -# Contributor: bill-auger - -pkgname=mcomix -pkgver=1.3.0.dev0 -pkgrel=3 -pkgrel+=.parabola1 -pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books" -pkgdesc+=", without non-free RAR support" -arch=('any') -url="https://github.com/multiSnow/mcomix3" -license=('GPL') -depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pillow') -makedepends=('git') -optdepends=('mupdf-tools: for pdf comics' - 'p7zip: for 7zip compressed comics') -_commit=a95f08140fc8850890f283bc06e3e2615477d736 # HEAD as of 20200528. -source=("git+https://github.com/multiSnow/mcomix3.git#commit=$_commit" - 'libre.patch') -sha256sums=('SKIP' - '8566f979b4d56866074f22a44ee31f6904dac6ef802fa88413cedd82ee752721') - -prepare() { - cd mcomix3 - - # Remove nonfree unRAR support - rm -v mcomix/mcomix/archive/rar{,_external}.py - patch -Np1 -i ${srcdir}/libre.patch -} - -package() { - cd mcomix3 - - python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/share - - install -dm755 "$pkgdir"/usr/bin - ln -s /usr/share/mcomix/mcomixstarter.py "$pkgdir"/usr/bin/mcomix - ln -s /usr/share/mcomix/comicthumb.py "$pkgdir"/usr/bin/comicthumb - - install -Dm644 mime/mcomix.desktop "$pkgdir"/usr/share/applications/mcomix.desktop - install -Dm644 mime/mcomix.appdata.xml "$pkgdir"/usr/share/metainfo/mcomix.appdata.xml - install -Dm644 mime/comicthumb.thumbnailer "$pkgdir"/usr/share/thumbnailers/comicthumb.thumbnailer - - for size in 16x16 22x22 24x24 32x32 48x48 - do - install -dm755 "$pkgdir"/usr/share/icons/hicolor/$size/apps/ - install -Dm644 mcomix/mcomix/images/$size/mcomix.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/mcomix.png - install -Dm644 mime/icons/$size/application-x-cb7.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cb7.png - install -Dm644 mime/icons/$size/application-x-cbt.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbt.png - done - - install -Dm644 man/mcomix.1 "$pkgdir"/usr/share/man/man1/mcomix.1 - install -Dm644 man/comicthumb.1 "$pkgdir"/usr/share/man/man1/comicthumb.1 -} diff --git a/libre/mcomix/libre.patch b/libre/mcomix/libre.patch deleted file mode 100644 index 20b0c3c..0000000 --- a/libre/mcomix/libre.patch +++ /dev/null @@ -1,254 +0,0 @@ -diff --git a/man/comicthumb.1 b/man/comicthumb.1 -index 4af1791..6546014 100644 ---- a/man/comicthumb.1 -+++ b/man/comicthumb.1 -@@ -1,7 +1,7 @@ - .TH comicthumb 1 - - .SH NAME --\fBcomicthumb\fP - Thumbnailer for cbz, cbr and cbt archives. -+\fBcomicthumb\fP - Thumbnailer for cbz and cbt archives. - - .SH SYNOPSIS - .nf -diff --git a/man/mcomix.1 b/man/mcomix.1 -index 5361e86..37b0698 100644 ---- a/man/mcomix.1 -+++ b/man/mcomix.1 -@@ -12,7 +12,7 @@ - .B MComix - is a user-friendly, customizable image viewer. It is specifically designed to - handle comic books (both Western comics and manga) and supports a variety of --container formats (including CBR, CBZ, CB7, CBT, LHA and PDF). -+container formats (including CBZ, CB7, CBT, LHA and PDF). - - .SH OPTIONS - .TP -diff --git a/mcomix/comicthumb.py b/mcomix/comicthumb.py -index 3606091..150a1f5 100755 ---- a/mcomix/comicthumb.py -+++ b/mcomix/comicthumb.py -@@ -34,7 +34,7 @@ def main(): - parser=argparse.ArgumentParser( - prog='comicthumb', - description='Thumbnailer for comic book archives', -- epilog='Supported formats: ZIP, RAR and tar (.cbz, .cbr, .cbt)', -+ epilog='Supported formats: ZIP and tar (.cbz, .cbt)', - ) - parser.add_argument('infile',default=None,metavar='INFILE', - help='input archive') -diff --git a/mcomix/mcomix/about_dialog.py b/mcomix/mcomix/about_dialog.py -index ba64a40..0160ed9 100644 ---- a/mcomix/mcomix/about_dialog.py -+++ b/mcomix/mcomix/about_dialog.py -@@ -28,7 +28,7 @@ class _AboutDialog(Gtk.AboutDialog): - comment = \ - _('%s is an image viewer specifically designed to handle comic books.') % \ - constants.APPNAME + ' ' + \ -- _('It reads ZIP, RAR and tar archives, as well as plain image files.') -+ _('It reads ZIP and tar archives, as well as plain image files.') - self.set_comments(comment) - - license = \ -diff --git a/mcomix/mcomix/archive_tools.py b/mcomix/mcomix/archive_tools.py -index c121f59..1f48aa8 100644 ---- a/mcomix/mcomix/archive_tools.py -+++ b/mcomix/mcomix/archive_tools.py -@@ -15,8 +15,6 @@ from mcomix.archive import ( - archivemount, - lha_external, - pdf_external, -- rar, -- rar_external, - sevenzip_external, - squashfs, - tar, -@@ -47,16 +45,6 @@ _HANDLERS = { - constants.XZ: ( - tar.TarArchive, - ), -- constants.RAR: ( -- rar.RarArchive, -- rar_external.RarArchive, -- # Last resort: some versions of 7z support RAR. -- sevenzip_external.SevenZipArchive, -- ), -- constants.RAR5: ( -- rar.RarArchive, -- rar_external.RarArchive, -- ), - constants.LHA: ( - # Prefer 7z over lha executable for Unicode support. - sevenzip_external.SevenZipArchive, -@@ -90,9 +78,6 @@ def _is_available(archive_type): - def szip_available(): - return _is_available(constants.SEVENZIP) - --def rar_available(): -- return _is_available(constants.RAR) -- - def lha_available(): - return _is_available(constants.LHA) - -@@ -109,7 +94,6 @@ def init_supported_formats(): - for name, formats, is_available in ( - ('ZIP', constants.ZIP_FORMATS , True ), - ('Tar', constants.TAR_FORMATS , True ), -- ('RAR', constants.RAR_FORMATS , rar_available() ), - ('7z' , constants.SZIP_FORMATS, szip_available()), - ('LHA', constants.LHA_FORMATS , lha_available() ), - ('PDF', constants.PDF_FORMATS , pdf_available() ), -@@ -168,11 +152,6 @@ def archive_mime_type(path): - else: - return constants.TAR - -- if magic.startswith(b'Rar!\x1a\x07'): -- if sevenzip_external.is_7z_support_rar(): -- return constants.RAR -- else: -- return constants.RAR5 - - if magic[0:6] == b'7z\xbc\xaf\x27\x1c': - return constants.SEVENZIP -diff --git a/mcomix/mcomix/constants.py b/mcomix/mcomix/constants.py -index 414f65c..e068218 100644 ---- a/mcomix/mcomix/constants.py -+++ b/mcomix/mcomix/constants.py -@@ -49,7 +49,7 @@ ANIMATION_NORMAL = 1 # loop as animation setting - ANIMATION_ONCE = 1<<1 # loop only once - ANIMATION_INF = 1<<2 # loop infinity - --ZIP, RAR, RAR5, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(12) -+ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(10) - NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4) - LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3) - AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \ -@@ -84,13 +84,6 @@ ZIP_FORMATS = ( - ('.cbz', 'application/vnd.comicbook+zip'), - ) - --RAR_FORMATS = ( -- # https://www.iana.org/assignments/media-types/application/vnd.rar -- ('.rar', 'application/vnd.rar'), -- # https://www.iana.org/assignments/media-types/application/vnd.comicbook-rar -- ('.cbr', 'application/vnd.comicbook-rar'), --) -- - TAR_FORMATS = ( - # not registed in IANA - ('.tar', 'application/x-tar'), -@@ -143,7 +136,7 @@ SQUASHFS_FORMATS = ( - ('.sqsh', 'application/vnd.squashfs'), - ) - --ARCHIVE_FORMATS = ZIP_FORMATS + RAR_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS -+ARCHIVE_FORMATS = ZIP_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS - ARCHIVE_FORMATS += SZIP_FORMATS + LHA_FORMATS + PDF_FORMATS - - # vim: expandtab:sw=4:ts=4 -diff --git a/mcomix/mcomix/messages/mcomix.pot b/mcomix/mcomix/messages/mcomix.pot -index e622347..02528c3 100644 ---- a/mcomix/mcomix/messages/mcomix.pot -+++ b/mcomix/mcomix/messages/mcomix.pot -@@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books." - msgstr "" - - #: mcomix/mcomix/about_dialog.py:30 --msgid "It reads ZIP, RAR and tar archives, as well as plain image files." -+msgid "It reads ZIP and tar archives, as well as plain image files." - msgstr "" - - #: mcomix/mcomix/about_dialog.py:34 -@@ -1523,10 +1523,6 @@ msgstr "" - msgid "ZIP archive" - msgstr "" - --#: mcomix/mcomix/strings.py:10 --msgid "RAR archive" --msgstr "" -- - #: mcomix/mcomix/strings.py:11 - msgid "Tar archive" - msgstr "" -diff --git a/mcomix/mcomix/strings.py b/mcomix/mcomix/strings.py -index 0eb2ea7..c534f5f 100644 ---- a/mcomix/mcomix/strings.py -+++ b/mcomix/mcomix/strings.py -@@ -3,11 +3,10 @@ - This file should only be imported after gettext has been correctly initialized - and installed in the global namespace. ''' - --from mcomix.constants import ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL -+from mcomix.constants import ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL - - ARCHIVE_DESCRIPTIONS = { - ZIP : _('ZIP archive'), -- RAR : _('RAR archive'), - TAR : _('Tar archive'), - GZIP : _('Gzip compressed tar archive'), - BZIP2 : _('Bzip2 compressed tar archive'), -diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas -index d8ab034..3bf2711 100644 ---- a/mime/comicbook.schemas -+++ b/mime/comicbook.schemas -@@ -1,27 +1,5 @@ - - -- -- /schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable -- /desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable -- comicthumb -- bool -- true -- -- -- -- -- -- -- /schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command -- /desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command -- comicthumb -- string -- comicthumb %i %o %s -- -- -- -- -- - - /schemas/desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable - /desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable -diff --git a/mime/comicthumb.thumbnailer b/mime/comicthumb.thumbnailer -index e357fe0..88cc59f 100644 ---- a/mime/comicthumb.thumbnailer -+++ b/mime/comicthumb.thumbnailer -@@ -1,4 +1,4 @@ - [Thumbnailer Entry] - TryExec=comicthumb - Exec=comicthumb %i %o %s --MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf -+MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf -diff --git a/mime/mcomix.appdata.xml b/mime/mcomix.appdata.xml -index 514f95d..b07b474 100644 ---- a/mime/mcomix.appdata.xml -+++ b/mime/mcomix.appdata.xml -@@ -10,7 +10,7 @@ -

- MComix is a user-friendly, customizable image viewer. It is specifically - designed to handle comic books (both Western comics and manga) and supports -- a variety of container formats (including CBR, CBZ, CB7, CBT, LHA and PDF). -+ a variety of container formats (including CBZ, CB7, CBT, LHA and PDF). -

-

- MComix is a fork of the Comix project, and aims to add bug fixes and -diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop -index 0bb8315..1d46cdf 100644 ---- a/mime/mcomix.desktop -+++ b/mime/mcomix.desktop -@@ -19,4 +19,4 @@ Terminal=false - Type=Application - StartupNotify=true - Categories=Graphics;Viewer; --MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap; -+MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap; diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD deleted file mode 100644 index 0836f64..0000000 --- a/libre/mkisolinux/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $ -# Maintainer (Arch): Tobias Powalowski -# Maintainer: Omar Vega Ramos - -pkgname=mkisolinux -pkgver=2013.05 -pkgrel=2.parabola1 -pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" -arch=(any) -license=('GPL') -url="https://parabolagnulinux.org/" -depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') -replaces=('mkbootcd' "${pkgname}-parabola") -conflicts=(${pkgname}-parabola) -backup=(etc/mkisolinux.conf) -source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') - - -package() -{ - cd "$srcdir/" - install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux" - install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf" - install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" - install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" -} -md5sums=('0ddb91a127ba040ce1434776d387825e' - 'd19183e162aff04f7f4c7b9e46be1315' - 'a474f11ab00ecbc12dafb548bb9ac025' - 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg deleted file mode 100644 index 2725404..0000000 --- a/libre/mkisolinux/boot.msg +++ /dev/null @@ -1,15 +0,0 @@ - - ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre -ISOLINUX BOOT -created with 'mkisolinux' written by Tobias Powalowski -rebranded for Parabola by André Silva - -Press ENTER or type 'parabola' to boot the CD. - -If you wish to change your defaults to boot into your existing system, -type 'vmlinuz initrd=initrd.img ' -Use the F2 key for troubleshooting and options. ------------------------------------------------------------------------------- - diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux deleted file mode 100755 index 048d925..0000000 --- a/libre/mkisolinux/mkisolinux +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# Settings -APPNAME=$(basename "${0}") -CONFIG="/etc/mkisolinux.conf" -GENIMG="" -BURN="0" -BLANK="0" -TARNAME="" -export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX) -usage () -{ - echo "${APPNAME}: usage" - echo " -g=IMAGE Generate a ISO image as IMAGE" - echo " -c=CONFIG Use CONFIG file. default: /etc/mkisolinux.conf" - echo " -B Burn the ISO image after creation" - echo " -b Blanking media first" - echo " -h This message." - exit 1 -} - -[ "$1" == "" ] && usage - -while [ $# -gt 0 ]; do - case $1 in - -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; - -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; - -B|--B) BURN="1" ;; - -b|--b) BLANK="1" ;; - -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; - -h|--h|?) usage ;; - *) usage ;; - esac - shift -done - -if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then - echo "ERROR: No image name specified, please use the -g option" - exit 1 -fi - -if [ ! -f "${CONFIG}" ]; then - echo "config file '${CONFIG}' cannot be found, aborting..." - exit 1 -fi - -. "${CONFIG}" -# export for mkinitcpio -[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE -[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE - -export RUNPROGRAM="${APPNAME}" -export BOOTDIRNAME="boot/syslinux" - -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) -[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) -export USEKERNEL=${VERSION} - -# begin script -mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/ -# prepare syslinux -install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin -for i in /usr/lib/syslinux/*.c32; do - install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) -done -install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids -# create syslinux.cfg -echo ":: Creating syslinux.cfg ..." -if [ "${ISOLINUXCFG}" = "" ]; then - [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg -else - sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg -fi -[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 - -echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." -# generate initramdisk -echo ":: Creating initramdisk ..." - mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img -echo ":: Using ${KERNEL} as image kernel ..." - install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz - install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg - install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 -# create image -echo ":: Creating ISO image ..." - [ -e ${GENIMG} ] && rm ${GENIMG} - [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" - mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \ - && echo ":: ISO Image succesfull created at ${GENIMG}" - # burning/blanking image - if [ "$BLANK" = "1" ]; then - echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." - cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." - fi - if [ "$BURN" = "1" ]; then - echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." - cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." - fi - -# clean /tmp -rm -r ${TEMPDIR} diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf deleted file mode 100644 index e8b1e0d..0000000 --- a/libre/mkisolinux/mkisolinux.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# config file of mkisolinux - -# DEFAULT kernel boot options like root=/dev/sda3 etc. -# add your root= option, if you boot from a disk device -# and don't want to add it by hand on each boot -KERNEL_BOOT_OPTIONS="" - -# mkinitcpio config file, defaulted to stock config file -MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" - -# kernel version, defaulted to build for runtime kernel -VERSION="$(uname -r)" - -# kernel image, defaulted to stock libre kernel -KERNEL="/boot/vmlinuz-linux-libre" - -# boot message files -BOOTMESSAGE="/usr/share/mkisolinux/boot.msg" -OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg" - -# syslinux.cfg file to use -SYSLINUXCFG="" - -# Prompt on boot, 1=yes 0=no -PROMPT="1" - -# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later -ISONAME="" - -# Timeout, 30 seconds to fix usb keyboard issues -# 0 means wait for prompt -TIMEOUT="300" - -# Setting cdrecord options -DEVICE="" -SPEED="" -BLANKMODE="" diff --git a/libre/mkisolinux/options.msg b/libre/mkisolinux/options.msg deleted file mode 100644 index 16c6b2e..0000000 --- a/libre/mkisolinux/options.msg +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre options and troubleshooting: - -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. ------------------------------------------------------------------------------- diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD deleted file mode 100644 index efcd0a5..0000000 --- a/libre/mkpxelinux/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $ -# Maintainer (Arch): Tobias Powalowski -# Maintainer: Omar Vega Ramos - -pkgname=mkpxelinux -pkgver=2013.10 -pkgrel=2.parabola1 -pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)" -arch=(any) -license=('GPL') -url="https://parabolagnulinux.org/" -depends=('mkinitcpio' 'tftp-hpa' 'syslinux') -replaces=(${pkgname}-parabola) -conflicts=(${pkgname}-parabola) -backup=(etc/mkpxelinux.conf) -optdepends=('dhcp: for dhcp server usage') -source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg') - -package() -{ - cd "$srcdir/" - install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux" - install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf" - install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg" - install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg" -} -md5sums=('7225e73bfe717f97bd7ab52f5ab157f6' - '44c6b9fa8ae668a432f26adb9e70bd3f' - '158dece3af889740b0f0ee397f9058ed' - 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkpxelinux/boot.msg b/libre/mkpxelinux/boot.msg deleted file mode 100644 index 6c1fcd4..0000000 --- a/libre/mkpxelinux/boot.msg +++ /dev/null @@ -1,14 +0,0 @@ - - ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre -PXELINUX BOOT -created with 'mkpxelinux' written by Tobias Powalowski - -Press ENTER or type 'parabola' to boot image. - -If you wish to change your defaults to boot into your existing system, -type 'vmlinuz initrd=initrd.img ' -Use the F2 key for troubleshooting and options. ------------------------------------------------------------------------------- - diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux deleted file mode 100755 index 35e946f..0000000 --- a/libre/mkpxelinux/mkpxelinux +++ /dev/null @@ -1,91 +0,0 @@ -#! /bin/sh -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# Settings -APPNAME=$(basename "${0}") -CONFIG="/etc/mkpxelinux.conf" - -usage () -{ - echo "${APPNAME}: usage" - echo"" - echo " -d=INSTALLDIR Your INSTALLDIR overwrites config default" - echo " -c=CONFIG Use CONFIG file. default: /etc/mkpxelinux.conf" - echo " -h This message." - exit 1 -} - -[ "$1" == "" ] && usage && exit 1 - -while [ $# -gt 0 ]; do - case $1 in - -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; - -d=*|--d=*) CUSTOMINSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;; - -h|--h|?) usage ;; - *) usage ;; - esac - shift -done - -if [ ! -f "${CONFIG}" ]; then - echo "config file '${CONFIG}' cannot be found, aborting..." - exit 1 -fi - -. "${CONFIG}" -# export for mkinitcpio -[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE -[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE - -! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR} - -if [ "${INSTALLDIR}" = "" ]; then - echo "ERROR: No INSTALLDIR name specified, please use the -d option" - exit 1 -fi - -if ! [ $UID -eq 0 ]; then - echo "ERROR: only works when run as root!" - exit 1 -fi - -! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1 -export TEMPDIR=${NFSROOTDIR} -export INSTALLDIR=${INSTALLDIR} -export RUNPROGRAM="${APPNAME}" -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) -export USEKERNEL=${VERSION} -# begin script -# create default -echo ":: Creating pxelinux default config file ..." -mkdir -p ${INSTALLDIR}/pxelinux.cfg -if [ "${PXELINUX_DEFAULT}" = "" ]; then - [ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default - echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "default parabola" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default - echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default -else - sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${PXELINUX_DEFAULT} > ${INSTALLDIR}/pxelinux.cfg/default -fi -[ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1 -echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." -# generate initramdisk -echo ":: Creating initramdisk ..." - mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img -echo ":: Using ${KERNEL} as image kernel ..." - install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz -echo ":: Installing message files to ${INSTALLDIR} ..." - install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg - install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg - [ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 - [ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 -echo ":: Installing PXELINUX to ${INSTALLDIR} ..." - install -m644 /usr/lib/syslinux/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed." diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf deleted file mode 100644 index 55aba82..0000000 --- a/libre/mkpxelinux/mkpxelinux.conf +++ /dev/null @@ -1,37 +0,0 @@ -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# config file of mkpxelinux - -# DEFAULT kernel boot options like ip=:::::eth0:dhcp etc. -# add your root= option, if you boot from a disk device -# and don't want to add it by hand on each boot -KERNEL_BOOT_OPTIONS="" - -# mkinitcpio config file, defaulted to stock config file -MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" - -# kernel version, defaulted to build for runtime kernel -VERSION="$(uname -r)" - -# kernel image, defaulted to stock libre kernel -KERNEL="/boot/vmlinuz-linux-libre" - -# boot message files -BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg" -OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg" - -#pxelinux default config file to use -PXELINUX_DEFAULT="" - -# Prompt on boot, 1=yes 0=no -PROMPT="1" - -# Timeout, 30 seconds to fix usb keyboard issues -# 0 means wait for prompt -TIMEOUT="300" - -# Installdir of tftp, default location -INSTALLDIR="/var/tftpboot" - -# Nfsrootdir, for hooks that might need it -NFSROOTDIR="" diff --git a/libre/mkpxelinux/options.msg b/libre/mkpxelinux/options.msg deleted file mode 100644 index 16c6b2e..0000000 --- a/libre/mkpxelinux/options.msg +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre options and troubleshooting: - -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. ------------------------------------------------------------------------------- diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD deleted file mode 100644 index fddc18a..0000000 --- a/libre/mksyslinux/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $ -# Maintainer (Arch): Tobias Powalowski -# Maintainer: Omar Vega Ramos - -pkgname=mksyslinux -pkgver=2013.06 -pkgrel=2.parabola1 -pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" -arch=(any) -license=('GPL') -url="https://parabolagnulinux.org/" -replaces=(${pkgname}-parabola) -conflicts=(${pkgname}-parabola) -depends=('mkinitcpio' 'syslinux' 'pciutils') -backup=(etc/mksyslinux.conf) -source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg') - -package() -{ - cd "$srcdir/" - install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux" - install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf" - install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" - install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" -} -md5sums=('e9836ac2bbb436ca3a13bfbe9cc5c19a' - '0a9fd93356b5d98ab386f28bc849b808' - 'c702b0b41ae7f58e9b08b53f3b6b0961' - 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg deleted file mode 100644 index 2cfe24d..0000000 --- a/libre/mksyslinux/boot.msg +++ /dev/null @@ -1,15 +0,0 @@ - - ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre -SYSLINUX BOOT -created with 'mksyslinux' by Tobias Powalowski -rebranded for Parabola by André Silva - -Press ENTER or type 'parabola' to boot image. - -If you wish to change your defaults to boot into your existing system, -type 'vmlinuz initrd=initrd.img ' -Use the F2 key for troubleshooting and options. ------------------------------------------------------------------------------- - diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux deleted file mode 100755 index 96ad451..0000000 --- a/libre/mksyslinux/mksyslinux +++ /dev/null @@ -1,144 +0,0 @@ -#! /bin/sh -# Created by Tobias Powalowski -# Settings -APPNAME=$(basename "${0}") -CONFIG="/etc/mksyslinux.conf" -export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX) -TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX) -BOOTDIRNAME=boot/syslinux - -usage () -{ - echo "${APPNAME}: usage" - echo "WRITING TO DEVICE:" - echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!" - echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!" - echo "" - echo "CREATING AN IMAGE FILE:" - echo "- For creating an image file use the -i=IMAGEFILE switch" - echo "- use 'dd if= of=' to write to your device afterwards." - echo "" - echo "PARAMETERS:" - echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install" - echo " -i=IMAGENAME Your IMAGENAME" - echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf" - echo " -h This message." - exit 1 -} - -[ "$1" == "" ] && usage && exit 1 - - -while [ $# -gt 0 ]; do - case $1 in - -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; - -d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;; - -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; - -h|--h|?) usage ;; - *) usage ;; - esac - shift -done - -if [ ! -f "${CONFIG}" ]; then - echo "config file '${CONFIG}' cannot be found, aborting..." - exit 1 -fi - -if [ "${IMAGENAME}" = "" ]; then - if [ "${DEVICE}" = "" ]; then - echo "ERROR: No DEVICE name specified, please use the -d option" - exit 1 - fi -fi - -if ! [ $UID -eq 0 ]; then - echo "ERROR: only works when run as root!" - exit 1 -fi - -. "${CONFIG}" -# export for mkinitcpio -[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE -[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX -[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE - -MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')" - -export RUNPROGRAM="${APPNAME}" -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) -export USEKERNEL=${VERSION} -# begin script -[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} -mkdir -p ${TEMPDIR} -echo ":: Mounting ${DEVICE} ..." -if ! [ "${IMAGENAME}" = "" ]; then - modprobe loop -else - mount ${DEVICE} ${TEMPDIR} || exit 1 -fi -mkdir -p ${TEMPDIR}/${BOOTDIRNAME} -# prepare syslinux bootloader -install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin -for i in /usr/lib/syslinux/*.c32; do - install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) -done -install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids - -# create syslinux.cfg -echo ":: Creating syslinux.cfg ..." -if [ "${SYSLINUXCFG}" = "" ]; then - [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg -else - sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg -fi -[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 -echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." -# generate initramdisk -echo ":: Creating initramdisk ..." - mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img -echo ":: Using ${KERNEL} as image kernel ..." - install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz - install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg - install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 -if ! [ "${IMAGENAME}" = "" ]; then - # ext2 overhead's upper bound is 6% - # empirically tested up to 1GB - rootsize=$(du -bs ${TEMPDIR}|cut -f1) - IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors - # create the filesystem image file - dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}" - # create a filesystem on the image - mkfs.vfat "${IMAGENAME}" - mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1 - cp -r "${TEMPDIR}"/* "$TMPDIR" - umount ${TMPDIR} -else - echo ":: Unmounting ${DEVICE} ..." - umount ${TEMPDIR} || exit 1 -fi -if ! [ "${IMAGENAME}" = "" ]; then - echo ":: Installing SYSLINUX on ${IMAGENAME} ..." - syslinux ${IMAGENAME} && echo "Installation completed." -else - echo ":: Installing MBR on ${MBRDEVICE} ..." - cat ${MBR} > ${MBRDEVICE} - echo ":: Installing SYSLINUX on ${DEVICE} ..." - syslinux -t offset ${DEVICE} && echo "Installation completed." -fi -# clean /tmp -rm -r ${TEMPDIR} -! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf deleted file mode 100644 index a7d0322..0000000 --- a/libre/mksyslinux/mksyslinux.conf +++ /dev/null @@ -1,34 +0,0 @@ -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# config file of mksyslinux - -# DEFAULT kernel boot options like root=/dev/sda3 etc. -# add your root= option, if you boot from a disk device -# and don't want to add it by hand on each boot -KERNEL_BOOT_OPTIONS="" - -# mkinitcpio config file, defaulted to stock config file -MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" - -# kernel version, defaulted to build for runtime kernel -VERSION="$(uname -r)" - -# kernel image, defaulted to stock libre kernel -KERNEL="/boot/vmlinuz-linux-libre" - -# boot message files -BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" -OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" - -# syslinux.cfg file to use -SYSLINUXCFG="" - -# Prompt on boot, 1=yes 0=no -PROMPT="1" - -# Timeout, 30 seconds to fix usb keyboard issues -# 0 means wait for prompt -TIMEOUT="300" - -# default MBR -MBR="/usr/lib/syslinux/mbr.bin" diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg deleted file mode 100644 index 16c6b2e..0000000 --- a/libre/mksyslinux/options.msg +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre options and troubleshooting: - -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. ------------------------------------------------------------------------------- diff --git a/libre/shntool/PKGBUILD b/libre/shntool/PKGBUILD deleted file mode 100644 index cc88117..0000000 --- a/libre/shntool/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer (Arch): schuay -# Contributor (Arch): Michal Hybner -# Maintainer: Omar Vega Ramos - -pkgname=shntool -pkgver=3.0.10 -pkgrel=5 -pkgrel+=.parabola1 -pkgdesc="A multi-purpose WAVE data processing and reporting utility" -pkgdesc+=", without nonfree mac recommendation" -arch=('x86_64') -arch+=('i686' 'armv7h') -url="http://shnutils.freeshell.org/shntool/" -license=('GPL') -options=(!emptydirs) -depends=('glibc') -optdepends=('flac: support for flac format' - 'wavpack: support for wv format') -source=("http://shnutils.freeshell.org/shntool/dist/src/${pkgname}-${pkgver}.tar.gz" - 'shntool-3.0.10-large-size.diff' - 'shntool-3.0.10-large-times.diff') - -# Patches taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684600 - -prepare() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 < "${srcdir}/shntool-3.0.10-large-size.diff" - patch -Np1 < "${srcdir}/shntool-3.0.10-large-times.diff" -} - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} - -md5sums=('5d41f8f42c3c15e3145a7a43539c3eae' - '4265935ef1d684a4b49041278ffda7de' - '6f0d61ddbf8cbee5c0b51a99e987ddda') - -# vim:set ts=2 sw=2 et: diff --git a/libre/shntool/shntool-3.0.10-large-size.diff b/libre/shntool/shntool-3.0.10-large-size.diff deleted file mode 100644 index 539c7fb..0000000 --- a/libre/shntool/shntool-3.0.10-large-size.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -aur shntool-3.0.10-clean/src/core_fileio.c shntool-3.0.10-size/src/core_fileio.c ---- shntool-3.0.10-clean/src/core_fileio.c 2009-03-11 17:18:01.000000000 +0000 -+++ shntool-3.0.10-size/src/core_fileio.c 2012-08-11 17:20:14.000000000 +0100 -@@ -110,10 +110,16 @@ - buf[4] = 0; - - if (be_val) -- *be_val = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; -+ *be_val = (((unsigned long)buf[0]) << 24) -+ | (((unsigned long)buf[1]) << 16) -+ | (((unsigned long)buf[2]) << 8) -+ | ((unsigned long)buf[3]); - - if (le_val) -- *le_val = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; -+ *le_val = (((unsigned long)buf[3]) << 24) -+ | (((unsigned long)buf[2]) << 16) -+ | (((unsigned long)buf[1]) << 8) -+ | ((unsigned long)buf[0]); - - if (tag_val) - tagcpy(tag_val,buf); diff --git a/libre/shntool/shntool-3.0.10-large-times.diff b/libre/shntool/shntool-3.0.10-large-times.diff deleted file mode 100644 index be4716e..0000000 --- a/libre/shntool/shntool-3.0.10-large-times.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -aur shntool-3.0.10-clean/src/core_mode.c shntool-3.0.10/src/core_mode.c ---- shntool-3.0.10-clean/src/core_mode.c 2009-03-30 06:55:33.000000000 +0100 -+++ shntool-3.0.10/src/core_mode.c 2012-08-11 16:37:58.000000000 +0100 -@@ -310,8 +310,8 @@ - if (sec >= 60) - st_error("invalid value for seconds: [%d]",sec); - -- bytes = (wlong)(min * info->rate * 60) + -- (wlong)(sec * info->rate); -+ bytes = (((wlong)min) * info->rate * 60) + -+ (((wlong)sec) * info->rate); - - return bytes; - } -@@ -358,9 +358,9 @@ - if (frames >= 75) - st_error("invalid value for frames: [%d]",frames); - -- bytes = (wlong)(min * CD_RATE * 60) + -- (wlong)(sec * CD_RATE) + -- (wlong)(frames * CD_BLOCK_SIZE); -+ bytes = (((wlong)min) * CD_RATE * 60) + -+ (((wlong)sec) * CD_RATE) + -+ (((wlong)frames) * CD_BLOCK_SIZE); - - return bytes; - } -@@ -403,8 +403,8 @@ - - nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5); - -- bytes = (wlong)(min * info->rate * 60) + -- (wlong)(sec * info->rate); -+ bytes = (((wlong)min) * info->rate * 60) + -+ (((wlong)sec) * info->rate); - - if (PROB_NOT_CD(info)) { - bytes += nearest_byte; - diff --git a/libre/wings3d/PKGBUILD b/libre/wings3d/PKGBUILD deleted file mode 100644 index 6797bce..0000000 --- a/libre/wings3d/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer (Arch): Alexander F. Rødseth -# Contributor (Arch): kappa -# Maintainer: Márcio Silva - -pkgname=wings3d -pkgver=2.2.5 -pkgrel=1 -pkgrel+=.parabola1 -pkgdesc='3D modeler using the winged edge data structure' -pkgdesc+=', without nonfree kerkythea render support' -arch=(x86_64) -arch+=(i686 armv7h) -# https is not available -url='http://www.wings3d.com/' -license=(GPL) -depends=(erlang erlang-cl erlang-sdl) -makedepends=(gendesk) -optdepends=('povray: render scenes with POV-Ray') -conflicts=("${pkgname}-libre") -replaces=("${pkgname}-libre") -source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2" - "$pkgname.sh") -sha256sums=('95ecf84a8f49bc00b983643e7ccd807f64a3b8b88253037a8ccefbe7a3bedff8' - '8e5e8f31d47ea55a0e9d311b7cc0eaac4e6050ac40506d3548b6ebae5d3618be') -_p=${pkgname%3d}-$pkgver - -prepare() { - gendesk -f -n \ - --name Wings3D \ - --pkgname $pkgname \ - --pkgdesc "$pkgdesc" \ - --genericname '3D Modeler' \ - --categories 'Graphics;3DGraphics' -} - -build() { - export ERL_LIBS="$srcdir" - make -C "${pkgname%3d}-$pkgver" unix -} - -package() { - install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname" - install -Dm644 -t "$pkgdir/usr/share/applications" $pkgname.desktop - cd "${pkgname%3d}-$pkgver/icons" - install -Dm644 wings_icon_48x48.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - cd ../build - install -d "$pkgdir/usr/lib/$pkgname" - cp -r "wings-$pkgver-linux/lib/wings-$pkgver"/* "$pkgdir/usr/lib/$pkgname/" - msg 'remove nonfree kerkythea render support plugin' - rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_kerky.beam -} - -# getver: -u=2 github.com/dgud/wings/releases -# vim: ts=2 sw=2 et: diff --git a/libre/wings3d/wings3d.png b/libre/wings3d/wings3d.png deleted file mode 100644 index 1fe6579..0000000 Binary files a/libre/wings3d/wings3d.png and /dev/null differ diff --git a/libre/wings3d/wings3d.sh b/libre/wings3d/wings3d.sh deleted file mode 100644 index 13130db..0000000 --- a/libre/wings3d/wings3d.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -exec /usr/bin/erl -noinput -smp \ - -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \ - -run wings_start start_halt ${1+"$@"} diff --git a/libre/xalan-java/PKGBUILD b/libre/xalan-java/PKGBUILD deleted file mode 100644 index 1723688..0000000 --- a/libre/xalan-java/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# Maintainer: Omar Vega Ramos - -_libname=xalan -pkgname=${_libname}-java -pkgver=2.7.2 -pkgrel=1.parabola1 -pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types" -arch=('any') -license=('APACHE') -url="http://xalan.apache.org/xalan-j/index.html" -depends=('java-runtime' 'xerces2-java') -makedepends=('apache-ant' 'jakarta-regexp' 'java-bcel' 'java-cup' 'jlex' 'jh' 'xerces2-java') -source=("http://archive.apache.org/dist/${_libname}/${_libname}-j/source/${_libname}-j_${pkgver//./_}-src.tar.gz" - "http://repo.maven.apache.org/maven2/${_libname}/${_libname}/${pkgver}/${_libname}-${pkgver}.pom" - "http://repo.maven.apache.org/maven2/${_libname}/serializer/${pkgver}/serializer-${pkgver}.pom") -md5sums=('74e6ab12dda778a4b26da67438880736' - '32d9a54317a2495ec8c7f4d9d89dd656' - '89a3a32915a378a87a113b917dd1144b') - -prepare() { - cd "${srcdir}/${_libname}-j_${pkgver//./_}" - rm -rv lib/*.jar - rm -rv tools/*.jar - sed -i 's/-static //g' build.xml - - ln -sf /usr/share/java/java_cup.jar tools/java_cup.jar - ln -sf /usr/share/java/JLex.jar tools/JLex.jar - ln -sf /usr/share/java/bcel.jar lib/BCEL.jar - ln -sf /usr/share/java/regexp.jar lib/regexp.jar - ln -sf /usr/share/java/java_cup.jar lib/runtime.jar -# ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar -} - -build() { - cd "${srcdir}/${_libname}-j_${pkgver//./_}" - - ant clean xsltc.clean jar xsltc.unbundledjar javadocs docs \ - -Dendorsed.dir=/usr/share/java/ -} - -package() { - cd "${srcdir}/${_libname}-j_${pkgver//./_}" - - # Install license file - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "build/docs" "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "samples" "${pkgdir}/usr/share/doc/${pkgname}/examples" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install ${_libname} ${_libname} ${pkgver} \ - "${srcdir}/${_libname}-${pkgver}.pom" \ - "build/${_libname}.jar" \ - "${_libname}.jar" - jh mvn-install ${_libname} serializer ${pkgver} \ - "${srcdir}/serializer-${pkgver}.pom" \ - "build/serializer.jar" \ - "serializer.jar" - - ln -s "/usr/share/java/${_libname}.jar" \ - "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar" - ln -s "/usr/share/java/serializer.jar" \ - "${pkgdir}/usr/share/java/serializer-${pkgver}.jar" - - install -m644 "build/xsltc.jar" "${pkgdir}/usr/share/java/" -} diff --git a/libre/xerces2-java/PKGBUILD b/libre/xerces2-java/PKGBUILD deleted file mode 100644 index aaf2811..0000000 --- a/libre/xerces2-java/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# Maintainer: Omar Vega Ramos - -_libname=xerces2 -pkgname=${_libname}-java -pkgver=2.11.0 -pkgrel=3.parabola1 -pkgdesc="High performance fully compliant Java XML parser" -arch=('any') -url="http://xml.apache.org/xerces2-j" -license=('APACHE') -depends=('java-runtime' 'java-resolver' 'java-xml-commons-external') -makedepends=('apache-ant' 'java-resolver' 'java-xml-commons-external' 'jh') -provides=("java-xerces2=${pkgver}") -conflicts=('java-xerces2') -replaces=('java-xerces2') -source=("http://archive.apache.org/dist/xerces/j/Xerces-J-src.${pkgver}.tar.gz" - "http://repo.maven.apache.org/maven2/xerces/xercesImpl/${pkgver}/xercesImpl-${pkgver}.pom" - "xerces2-java-taskdef.patch" - "xerces2-java-dont_unzip.patch" - "xerces2-java-HTMLObjectElementImpl.patch") -md5sums=('d01fc11eacbe43b45681cb85ac112ebf' - '64288948e6420e49679348b0ce1963f8' - '600788add1665864495e2bd0ab015613' - '3bd20b2ea82f14d77031bf0e49c03516' - 'e1c26eeaedd33dc0a7af493a07a17211') - -prepare() { - cd "${srcdir}/xerces-${pkgver//./_}" - mkdir -p tools - patch -Np1 -i ../xerces2-java-taskdef.patch - patch -Np1 -i ../xerces2-java-dont_unzip.patch - patch -Np1 -i ../xerces2-java-HTMLObjectElementImpl.patch -} - -build() { - cd "${srcdir}/xerces-${pkgver//./_}" - ln -sf /usr/share/java/resolver.jar tools/resolver.jar - ln -sf /usr/share/java/xml-apis.jar tools/xml-apis.jar - - ant clean jar sampjar javadocs -} - -package() { - cd "${srcdir}/xerces-${pkgver//./_}" - - # Install license file - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "build/docs/javadocs" "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "build/samples" "${pkgdir}/usr/share/doc/${pkgname}/examples" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install xerces xercesImpl ${pkgver} \ - "${srcdir}/xercesImpl-${pkgver}.pom" \ - "build/xercesImpl.jar" \ - "xercesImpl.jar" - - ln -s "/usr/share/java/xercesImpl.jar" \ - "${pkgdir}/usr/share/java/xercesImpl-${pkgver}.jar" -} diff --git a/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch b/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch deleted file mode 100644 index b18badc..0000000 --- a/libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLElementImpl.java 2010-11-26 15:42:05.000000000 -0500 -+++ xerces-2_11_0/src/org/apache/html/dom/HTMLElementImpl.java 2015-12-02 09:54:52.042144620 -0500 -@@ -20,6 +20,7 @@ - - import org.apache.xerces.dom.ElementImpl; - import org.w3c.dom.Attr; -+import org.w3c.dom.Document; - import org.w3c.dom.Node; - import org.w3c.dom.NodeList; - import org.w3c.dom.html.HTMLElement; -@@ -254,4 +255,7 @@ - return null; - } - -+ public Document getContentDocument() { -+ throw new UnsupportedOperationException(); -+ } - } diff --git a/libre/xerces2-java/xerces2-java-dont_unzip.patch b/libre/xerces2-java/xerces2-java-dont_unzip.patch deleted file mode 100644 index 8d068a2..0000000 --- a/libre/xerces2-java/xerces2-java-dont_unzip.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- xerces-2_11_0.orig/build.xml 2010-11-26 15:42:11.000000000 -0500 -+++ xerces-2_11_0/build.xml 2015-12-03 02:10:02.884516544 -0500 -@@ -246,30 +246,6 @@ - tofile="${build.src}/org/apache/xerces/impl/msg/XPointerMessages_en.properties"/> - -- -- -- -- -- - - - - -- -- -- -- -- -- - - - - - -- -+ - - - -@@ -291,7 +291,7 @@ - source="${javac.source}" - target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" -- debug="${debug}" -+ debug="${debug}" nowarn="true" - debuglevel="${debuglevel}" - deprecation="${deprecation}" - optimize="${optimize}" -@@ -359,7 +359,7 @@ - source="${javac.source}" - target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" -- debug="${debug}" -+ debug="${debug}" nowarn="true" - debuglevel="${debuglevel}" - includeAntRuntime="false" - includeJavaRuntime="true"/> -@@ -379,7 +379,7 @@ - source="${javac.source}" - target="${javac.target}" - classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar" -- debug="${debug}" -+ debug="${debug}" nowarn="true" - debuglevel="${debuglevel}" - includeAntRuntime="false" - includeJavaRuntime="true"/> diff --git a/nonprism/digikam/0001-optionally-enable-OpenGL.patch b/nonprism/digikam/0001-optionally-enable-OpenGL.patch deleted file mode 100644 index f87e8e4..0000000 --- a/nonprism/digikam/0001-optionally-enable-OpenGL.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9b37ca152cbae4b86ce2b93f7b1af58f092d1ccf Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Tue, 5 Jul 2016 18:47:56 -0600 -Subject: [PATCH] optionally enable OpenGL - -Signed-off-by: Kevin Mihelich ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89e0682..b60d0b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,6 +105,7 @@ option(ENABLE_KFILEMETADATASUPPORT "Build digiKam with KDE files indexer suppor - option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)" OFF) - option(ENABLE_MEDIAPLAYER "Build digiKam with Media Player support (default=OFF)" OFF) - option(ENABLE_DBUS "Build digiKam with DBUS support (default=ON)" ON) -+option(ENABLE_OPENGL "Build digiKam with OpenGL support (default=ON)" ON) - option(ENABLE_APPSTYLES "Build digiKam with support for changing the widget application style (default=OFF)" OFF) - - # Mysql support options (experimental): -@@ -293,7 +294,7 @@ else() - endif() - - # decide if Presentation tool can be built with OpenGL --if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND) -+if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL) - set(HAVE_OPENGL TRUE) - elseif() - set(HAVE_OPENGL FALSE) --- -2.10.2 - diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD deleted file mode 100644 index da82a61..0000000 --- a/nonprism/digikam/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id$ -# Maintainer (Arch): Ronald van Haren -# Maintainer (Arch): Antonio Rojas -# Contributor (Arch): Andrea Scarpino -# Contributor (Arch): Tobias Powalowski -# Contributor: Andreas Grapentin -# Contributor: André Silva -# Contributor: Márcio Silva -# Contributor: jc_gargma - -# parabola changes and rationale: -# - remove libkvkontakte support for kipi-plugins - -pkgbase=digikam -pkgname=(kipi-plugins) -_pkgver=5.9.0 -pkgver=${_pkgver//-/_} # for beta versions -pkgrel=1 -pkgrel+=.nonprism1 -pkgdesc="An advanced digital photo management application" -arch=(x86_64) -arch+=(i686 armv7h) -license=(GPL) -url="http://www.digikam.org/" -makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common - kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu) -source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz") -source+=("libre.patch" "nonprism.patch") -sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b' - '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89' - 'e3d8ec4fd041a5545b7efef167d3b2ae6efc1f510832dabc7430ddfeb6b3c4ac') - -prepare() { - mkdir -p build - -# fix freedom issues - cd $pkgbase-$_pkgver - patch -Np1 -i "$srcdir"/libre.patch - patch -Np1 -i "$srcdir"/nonprism.patch -} - -build() { - cd build - - cmake ../$pkgbase-${_pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF \ - -DENABLE_KFILEMETADATASUPPORT=ON \ - -DENABLE_MEDIAPLAYER=ON \ - -DENABLE_AKONADICONTACTSUPPORT=ON \ - -DENABLE_MYSQLSUPPORT=ON \ - -DENABLE_OPENCV3=ON \ - -DENABLE_APPSTYLES=ON \ - -DENABLE_LEGACY=ON \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF - make -} - -package_kipi-plugins() { - pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" - pkgdesc+=", without nonfree suggestions and support for unsafe and dangerous for privacy protocols" - depends=(kio libkipi) - optdepends=('libmediawiki: MediaWiki Export plugin') - - cd build/extra - make DESTDIR="$pkgdir" install - cd $srcdir/build/po - make DESTDIR="$pkgdir" install - -# Provided by digikam - rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo -} diff --git a/nonprism/digikam/libre.patch b/nonprism/digikam/libre.patch deleted file mode 100644 index 8c677e2..0000000 --- a/nonprism/digikam/libre.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h -index 0f58cc4..b497299 100644 ---- a/extra/kipi-plugins/sendimages/emailsettings.h -+++ b/extra/kipi-plugins/sendimages/emailsettings.h -@@ -64,10 +64,9 @@ public: - CLAWSMAIL, - EVOLUTION, - KMAIL, -- NETSCAPE, - SYLPHEED, - SYLPHEEDCLAWS, -- THUNDERBIRD -+ ICEDOVE - }; - - enum ImageSize -diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp -index 1be65d6..68094de 100644 ---- a/extra/kipi-plugins/sendimages/sendimages.cpp -+++ b/extra/kipi-plugins/sendimages/sendimages.cpp -@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent() - // More info about command lines options with Mozilla & co: - // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules - -- case EmailSettings::NETSCAPE: -- case EmailSettings::THUNDERBIRD: -+ case EmailSettings::ICEDOVE: - { - QString prog; - -- if (d->settings.emailProgram == EmailSettings::NETSCAPE) -+ if (d->settings.emailProgram == EmailSettings::ICEDOVE) - { -- prog = QLatin1String("netscape"); -- } -- else -- { -- prog = QLatin1String("thunderbird"); -+ prog = QLatin1String("icedove"); - } - - QStringList args; -diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp -index b8416a4..f160310 100644 ---- a/extra/kipi-plugins/sendimages/settingswidget.cpp -+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp -@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent) - d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail")); - d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution")); - d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail")); -- d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape")); - d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed")); - d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws")); -- d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird")); -+ d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove")); - #endif - d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT); - d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. " diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch deleted file mode 100644 index 779196f..0000000 --- a/nonprism/digikam/nonprism.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/doc/TODO b/doc/TODO -index a0ac4f4c6..23bf7450f 100644 ---- a/doc/TODO -+++ b/doc/TODO -@@ -78,16 +78,10 @@ menu-mainwindow.docbook * * Gi - tool-acquireimages.docbook - tool-advrename.docbook Need to be created - tool-calendar.docbook Need to be created --tool-dropbox.docbook Need to be created - tool-expoblending.docbook Need to be created --tool-facebook.docbook Need to be created - tool-findduplicates.docbook Need to be created - tool-flashexport.docbook Need to be created --tool-flickrexport.docbook - tool-geolocationeditor.docbook Need to be created --tool-googleexport.docbook Need to be created --tool-imageshack.docbook Need to be created --tool-imgur.docbook Need to be created - tool-kmlexport.docbook Need to be created - tool-maintenance.docbook Need to be created - tool-mediawiki.docbook Need to be created -@@ -97,12 +91,8 @@ tool-panorama.docbook - tool-piwigoexport.docbook Need to be created - tool-presentation.docbook - tool-printwizard.docbook --tool-rajce.docbook Need to be created - tool-remotestorage.docbook Need to be created - tool-sendimages.docbook --tool-smug.docbook Need to be created --tool-vkontakte.docbook Need to be created --tool-yandexfotki.docbook Need to be created - using-bqm.docbook - using-camera.docbook DONE DONE Gilles - using-camera-intro.docbook -diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook -index 080275044..0fe7027c9 100644 ---- a/doc/digikam/index.docbook -+++ b/doc/digikam/index.docbook -@@ -172,21 +172,11 @@ - - - -- - - -- - -- -- -- -- - -- - -- -- -- - - - -@@ -311,21 +301,11 @@ - - &doc-tool-printwizard; - &doc-tool-sendimages; -- &doc-tool-flickrexport; - &doc-tool-piwigoexport; - &doc-tool-kmlexport; -- &doc-tool-googleexport; - &doc-tool-flashexport; -- &doc-tool-dropbox; -- &doc-tool-facebook; -- &doc-tool-imageshack; -- &doc-tool-imgur; - &doc-tool-mediawiki; -- &doc-tool-rajce; - &doc-tool-remotestorage; -- &doc-tool-smug; -- &doc-tool-vkontakte; -- &doc-tool-yandexfotki; - - - -diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook -index 5c8e8e2b2..acdef13a2 100644 ---- a/doc/digikam/menu-mainwindow.docbook -+++ b/doc/digikam/menu-mainwindow.docbook -@@ -943,22 +943,6 @@ - - - -- ExportKML Export... -- -- -- -- Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth. -- -- -- See the dedicated -- KML Export Tool -- for more information. -- -- -- -- -- -- - ToolsExport to Piwigo - - -@@ -973,21 +957,6 @@ - - - -- -- -- ExportExport to Flickr... -- -- -- -- Tool to upload or update images to Flickr server. -- -- -- See the dedicated -- Flickr Export Tool -- for more information. -- -- -- - -- -- -- ExportExport to Google Photos... -- -- -- -- Tool upload or update images to Google Photos galleries. -- -- -- See the dedicated -- Google Services Tool -- for more information. -- -- -- -- -- -- -- ExportExport to Google Drive... -- -- -- -- Tool upload images to Google Drive. -- -- -- See the dedicated -- Google Services Tool -- for more information. -- -- -- - may be difficult to maintain -# * freeze the version --> does anyone want a frozen GUI web browser? -# * blacklist it --> RIP qutebrowser - parabola has plenty more :) +# - freeze at v2.5.0 (final release with webkit support) + pkgname=qutebrowser @@ -31,8 +27,7 @@ url="https://www.qutebrowser.org/" license=("GPL") depends=("python-jinja" "python-pyqt5" "python-yaml" "qt5-base" "python-pyqtwebengine") depends=( ${depends[*]/python-pyqtwebengine/qt5-webkit} ) -depends+=( asciidoc=10.2.0 ) - +depends+=( asciidoc=10.2.0 ) # asciidoc<10.2.0 depends on python2 makedepends=("asciidoc" "python-setuptools") optdepends=("python-adblock: adblocking backend" "python-pygments" From d2cee666e198039abb285150cfa7c9542a8f7c6b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Nov 28 2022 12:17:07 +0000 Subject: [PATCH 184/200] [iceweasel]: upgrade to v106.0.3 --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index b685010..287dd79 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=106.0.1 +pkgver=106.0.3 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -112,7 +112,7 @@ source_i686=(avoid-libxul-OOM-python-check.patch firefox-106.0.1-fdlibm.patch simd_avx2.patch fix-i686-build-moz-1792159.patch) -sha256sums=('bdf8184f9aadce4fd9613ec63525a96891e2e9dbbef9e4f72193038450a7fd35' +sha256sums=('6f7cc633d75872cb8776feefafcec20becb448359bd591f8204a21fd4b845f8e' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' From 6b9a71b58f2da7f0fcf980458b09cabd54ea6261 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Nov 28 2022 12:17:10 +0000 Subject: [PATCH 185/200] [iceweasel]: WIP --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 287dd79..2f0789c 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -120,7 +120,6 @@ sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' -# 'e66bc271b35e0eabe1e8a67802ce95ea3742d73006b8ad37bbce225457366458' '0c5333c4fc28ba9ca5b4d00127918d662fe8c570d4ebc0a64e5174e0ef41ae01' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45' @@ -153,6 +152,8 @@ validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger # disable PGO for 32-bit arches _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely) +makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.18.0} ) + makedepends+=( python-pydantic=1.9.2 ) # dustbin - configure error: "pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not)" case "${CARCH}" in @@ -463,6 +464,7 @@ END done cp iceweasel_logo.svg content/aboutlogins.svg cp iceweasel_logo.svg content/about-logo.svg +# cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png cp content/about-logo.png content/about-logo-private.png From d4b5fb2e49c6ce7ed8640156a5610231969198e2 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Nov 28 2022 12:17:13 +0000 Subject: [PATCH 186/200] [iceweasel]: upgrade to v107.0 --- diff --git a/libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch b/libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch new file mode 100644 index 0000000..7080726 --- /dev/null +++ b/libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch @@ -0,0 +1,5941 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sat, 29 Oct 2022 17:43:52 +0200 +Subject: [PATCH] libwebrtc screen-cast sync + +Patch from Fedora, at +https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/libwebrtc-screen-cast-sync.patch + +Fixes: https://bugs.archlinux.org/task/76231 +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1790496 +--- + dom/media/webrtc/moz.build | 2 + + third_party/drm/README | 4 + + third_party/drm/drm/drm.h | 1193 ++++++++++++++ + third_party/drm/drm/drm_fourcc.h | 1377 +++++++++++++++++ + third_party/drm/drm/drm_mode.h | 1217 +++++++++++++++ + third_party/drm/drm/xf86drm.h | 966 ++++++++++++ + .../libpipewire => drm/libdrm}/moz.build | 4 +- + third_party/drm/libdrm/mozdrm.cpp | 66 + + third_party/gbm/README | 4 + + third_party/gbm/gbm/gbm.h | 452 ++++++ + .../libpipewire => gbm/libgbm}/moz.build | 4 +- + third_party/gbm/libgbm/mozgbm.cpp | 66 + + .../desktop_capture_generic_gn/moz.build | 45 +- + .../desktop_capture_options.cc | 4 +- + .../desktop_capture/desktop_capture_options.h | 6 +- + .../linux/wayland/base_capturer_pipewire.cc | 2 +- + .../desktop_capture/screen_capturer_linux.cc | 8 - + .../desktop_capture/window_capturer_linux.cc | 8 - + third_party/moz.build | 6 + + .../pipewire/libpipewire/mozpipewire.cpp | 49 +- + 20 files changed, 5450 insertions(+), 33 deletions(-) + create mode 100644 third_party/drm/README + create mode 100644 third_party/drm/drm/drm.h + create mode 100644 third_party/drm/drm/drm_fourcc.h + create mode 100644 third_party/drm/drm/drm_mode.h + create mode 100644 third_party/drm/drm/xf86drm.h + copy third_party/{pipewire/libpipewire => drm/libdrm}/moz.build (86%) + create mode 100644 third_party/drm/libdrm/mozdrm.cpp + create mode 100644 third_party/gbm/README + create mode 100644 third_party/gbm/gbm/gbm.h + copy third_party/{pipewire/libpipewire => gbm/libgbm}/moz.build (86%) + create mode 100644 third_party/gbm/libgbm/mozgbm.cpp + +diff --git a/dom/media/webrtc/moz.build b/dom/media/webrtc/moz.build +index ddf9321b58ea..af0f7ab64cc3 100644 +--- a/dom/media/webrtc/moz.build ++++ b/dom/media/webrtc/moz.build +@@ -84,6 +84,8 @@ if CONFIG["MOZ_WEBRTC_SIGNALING"]: + ] + + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": ++ DIRS += ["/third_party/drm/libdrm"] ++ DIRS += ["/third_party/gbm/libgbm"] + DIRS += ["/third_party/pipewire/libpipewire"] + + # Avoid warnings from third-party code that we can not modify. +diff --git a/third_party/drm/README b/third_party/drm/README +new file mode 100644 +index 000000000000..f68ed100bb77 +--- /dev/null ++++ b/third_party/drm/README +@@ -0,0 +1,4 @@ ++Libdrm is a drm library wrapper needed to build and run Firefox with ++Pipewire support on Linux (https://gitlab.freedesktop.org/mesa/drm). ++ ++libdrm directory stores headers of libdrm needed for build only. +diff --git a/third_party/drm/drm/drm.h b/third_party/drm/drm/drm.h +new file mode 100644 +index 000000000000..5e54c3aa4c3a +--- /dev/null ++++ b/third_party/drm/drm/drm.h +@@ -0,0 +1,1193 @@ ++/* ++ * Header for the Direct Rendering Manager ++ * ++ * Author: Rickard E. (Rik) Faith ++ * ++ * Acknowledgments: ++ * Dec 1999, Richard Henderson , move to generic cmpxchg. ++ */ ++ ++/* ++ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. ++ * All rights reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#ifndef _DRM_H_ ++#define _DRM_H_ ++ ++#if defined(__linux__) ++ ++#include ++#include ++typedef unsigned int drm_handle_t; ++ ++#else /* One of the BSDs */ ++ ++#include ++#include ++#include ++typedef int8_t __s8; ++typedef uint8_t __u8; ++typedef int16_t __s16; ++typedef uint16_t __u16; ++typedef int32_t __s32; ++typedef uint32_t __u32; ++typedef int64_t __s64; ++typedef uint64_t __u64; ++typedef size_t __kernel_size_t; ++typedef unsigned long drm_handle_t; ++ ++#endif ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++#define DRM_NAME "drm" /**< Name in kernel, /dev, and /proc */ ++#define DRM_MIN_ORDER 5 /**< At least 2^5 bytes = 32 bytes */ ++#define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ ++#define DRM_RAM_PERCENT 10 /**< How much system ram can we lock? */ ++ ++#define _DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ ++#define _DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ ++#define _DRM_LOCK_IS_HELD(lock) ((lock) & _DRM_LOCK_HELD) ++#define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT) ++#define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT)) ++ ++typedef unsigned int drm_context_t; ++typedef unsigned int drm_drawable_t; ++typedef unsigned int drm_magic_t; ++ ++/* ++ * Cliprect. ++ * ++ * \warning: If you change this structure, make sure you change ++ * XF86DRIClipRectRec in the server as well ++ * ++ * \note KW: Actually it's illegal to change either for ++ * backwards-compatibility reasons. ++ */ ++struct drm_clip_rect { ++ unsigned short x1; ++ unsigned short y1; ++ unsigned short x2; ++ unsigned short y2; ++}; ++ ++/* ++ * Drawable information. ++ */ ++struct drm_drawable_info { ++ unsigned int num_rects; ++ struct drm_clip_rect *rects; ++}; ++ ++/* ++ * Texture region, ++ */ ++struct drm_tex_region { ++ unsigned char next; ++ unsigned char prev; ++ unsigned char in_use; ++ unsigned char padding; ++ unsigned int age; ++}; ++ ++/* ++ * Hardware lock. ++ * ++ * The lock structure is a simple cache-line aligned integer. To avoid ++ * processor bus contention on a multiprocessor system, there should not be any ++ * other data stored in the same cache line. ++ */ ++struct drm_hw_lock { ++ __volatile__ unsigned int lock; /**< lock variable */ ++ char padding[60]; /**< Pad to cache line */ ++}; ++ ++/* ++ * DRM_IOCTL_VERSION ioctl argument type. ++ * ++ * \sa drmGetVersion(). ++ */ ++struct drm_version { ++ int version_major; /**< Major version */ ++ int version_minor; /**< Minor version */ ++ int version_patchlevel; /**< Patch level */ ++ __kernel_size_t name_len; /**< Length of name buffer */ ++ char *name; /**< Name of driver */ ++ __kernel_size_t date_len; /**< Length of date buffer */ ++ char *date; /**< User-space buffer to hold date */ ++ __kernel_size_t desc_len; /**< Length of desc buffer */ ++ char *desc; /**< User-space buffer to hold desc */ ++}; ++ ++/* ++ * DRM_IOCTL_GET_UNIQUE ioctl argument type. ++ * ++ * \sa drmGetBusid() and drmSetBusId(). ++ */ ++struct drm_unique { ++ __kernel_size_t unique_len; /**< Length of unique */ ++ char *unique; /**< Unique name for driver instantiation */ ++}; ++ ++struct drm_list { ++ int count; /**< Length of user-space structures */ ++ struct drm_version *version; ++}; ++ ++struct drm_block { ++ int unused; ++}; ++ ++/* ++ * DRM_IOCTL_CONTROL ioctl argument type. ++ * ++ * \sa drmCtlInstHandler() and drmCtlUninstHandler(). ++ */ ++struct drm_control { ++ enum { ++ DRM_ADD_COMMAND, ++ DRM_RM_COMMAND, ++ DRM_INST_HANDLER, ++ DRM_UNINST_HANDLER ++ } func; ++ int irq; ++}; ++ ++/* ++ * Type of memory to map. ++ */ ++enum drm_map_type { ++ _DRM_FRAME_BUFFER = 0, /**< WC (no caching), no core dump */ ++ _DRM_REGISTERS = 1, /**< no caching, no core dump */ ++ _DRM_SHM = 2, /**< shared, cached */ ++ _DRM_AGP = 3, /**< AGP/GART */ ++ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ ++ _DRM_CONSISTENT = 5 /**< Consistent memory for PCI DMA */ ++}; ++ ++/* ++ * Memory mapping flags. ++ */ ++enum drm_map_flags { ++ _DRM_RESTRICTED = 0x01, /**< Cannot be mapped to user-virtual */ ++ _DRM_READ_ONLY = 0x02, ++ _DRM_LOCKED = 0x04, /**< shared, cached, locked */ ++ _DRM_KERNEL = 0x08, /**< kernel requires access */ ++ _DRM_WRITE_COMBINING = 0x10, /**< use write-combining if available */ ++ _DRM_CONTAINS_LOCK = 0x20, /**< SHM page that contains lock */ ++ _DRM_REMOVABLE = 0x40, /**< Removable mapping */ ++ _DRM_DRIVER = 0x80 /**< Managed by driver */ ++}; ++ ++struct drm_ctx_priv_map { ++ unsigned int ctx_id; /**< Context requesting private mapping */ ++ void *handle; /**< Handle of map */ ++}; ++ ++/* ++ * DRM_IOCTL_GET_MAP, DRM_IOCTL_ADD_MAP and DRM_IOCTL_RM_MAP ioctls ++ * argument type. ++ * ++ * \sa drmAddMap(). ++ */ ++struct drm_map { ++ unsigned long offset; /**< Requested physical address (0 for SAREA)*/ ++ unsigned long size; /**< Requested physical size (bytes) */ ++ enum drm_map_type type; /**< Type of memory to map */ ++ enum drm_map_flags flags; /**< Flags */ ++ void *handle; /**< User-space: "Handle" to pass to mmap() */ ++ /**< Kernel-space: kernel-virtual address */ ++ int mtrr; /**< MTRR slot used */ ++ /* Private data */ ++}; ++ ++/* ++ * DRM_IOCTL_GET_CLIENT ioctl argument type. ++ */ ++struct drm_client { ++ int idx; /**< Which client desired? */ ++ int auth; /**< Is client authenticated? */ ++ unsigned long pid; /**< Process ID */ ++ unsigned long uid; /**< User ID */ ++ unsigned long magic; /**< Magic */ ++ unsigned long iocs; /**< Ioctl count */ ++}; ++ ++enum drm_stat_type { ++ _DRM_STAT_LOCK, ++ _DRM_STAT_OPENS, ++ _DRM_STAT_CLOSES, ++ _DRM_STAT_IOCTLS, ++ _DRM_STAT_LOCKS, ++ _DRM_STAT_UNLOCKS, ++ _DRM_STAT_VALUE, /**< Generic value */ ++ _DRM_STAT_BYTE, /**< Generic byte counter (1024bytes/K) */ ++ _DRM_STAT_COUNT, /**< Generic non-byte counter (1000/k) */ ++ ++ _DRM_STAT_IRQ, /**< IRQ */ ++ _DRM_STAT_PRIMARY, /**< Primary DMA bytes */ ++ _DRM_STAT_SECONDARY, /**< Secondary DMA bytes */ ++ _DRM_STAT_DMA, /**< DMA */ ++ _DRM_STAT_SPECIAL, /**< Special DMA (e.g., priority or polled) */ ++ _DRM_STAT_MISSED /**< Missed DMA opportunity */ ++ /* Add to the *END* of the list */ ++}; ++ ++/* ++ * DRM_IOCTL_GET_STATS ioctl argument type. ++ */ ++struct drm_stats { ++ unsigned long count; ++ struct { ++ unsigned long value; ++ enum drm_stat_type type; ++ } data[15]; ++}; ++ ++/* ++ * Hardware locking flags. ++ */ ++enum drm_lock_flags { ++ _DRM_LOCK_READY = 0x01, /**< Wait until hardware is ready for DMA */ ++ _DRM_LOCK_QUIESCENT = 0x02, /**< Wait until hardware quiescent */ ++ _DRM_LOCK_FLUSH = 0x04, /**< Flush this context's DMA queue first */ ++ _DRM_LOCK_FLUSH_ALL = 0x08, /**< Flush all DMA queues first */ ++ /* These *HALT* flags aren't supported yet ++ -- they will be used to support the ++ full-screen DGA-like mode. */ ++ _DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */ ++ _DRM_HALT_CUR_QUEUES = 0x20 /**< Halt all current queues */ ++}; ++ ++/* ++ * DRM_IOCTL_LOCK, DRM_IOCTL_UNLOCK and DRM_IOCTL_FINISH ioctl argument type. ++ * ++ * \sa drmGetLock() and drmUnlock(). ++ */ ++struct drm_lock { ++ int context; ++ enum drm_lock_flags flags; ++}; ++ ++/* ++ * DMA flags ++ * ++ * \warning ++ * These values \e must match xf86drm.h. ++ * ++ * \sa drm_dma. ++ */ ++enum drm_dma_flags { ++ /* Flags for DMA buffer dispatch */ ++ _DRM_DMA_BLOCK = 0x01, /**< ++ * Block until buffer dispatched. ++ * ++ * \note The buffer may not yet have ++ * been processed by the hardware -- ++ * getting a hardware lock with the ++ * hardware quiescent will ensure ++ * that the buffer has been ++ * processed. ++ */ ++ _DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */ ++ _DRM_DMA_PRIORITY = 0x04, /**< High priority dispatch */ ++ ++ /* Flags for DMA buffer request */ ++ _DRM_DMA_WAIT = 0x10, /**< Wait for free buffers */ ++ _DRM_DMA_SMALLER_OK = 0x20, /**< Smaller-than-requested buffers OK */ ++ _DRM_DMA_LARGER_OK = 0x40 /**< Larger-than-requested buffers OK */ ++}; ++ ++/* ++ * DRM_IOCTL_ADD_BUFS and DRM_IOCTL_MARK_BUFS ioctl argument type. ++ * ++ * \sa drmAddBufs(). ++ */ ++struct drm_buf_desc { ++ int count; /**< Number of buffers of this size */ ++ int size; /**< Size in bytes */ ++ int low_mark; /**< Low water mark */ ++ int high_mark; /**< High water mark */ ++ enum { ++ _DRM_PAGE_ALIGN = 0x01, /**< Align on page boundaries for DMA */ ++ _DRM_AGP_BUFFER = 0x02, /**< Buffer is in AGP space */ ++ _DRM_SG_BUFFER = 0x04, /**< Scatter/gather memory buffer */ ++ _DRM_FB_BUFFER = 0x08, /**< Buffer is in frame buffer */ ++ _DRM_PCI_BUFFER_RO = 0x10 /**< Map PCI DMA buffer read-only */ ++ } flags; ++ unsigned long agp_start; /**< ++ * Start address of where the AGP buffers are ++ * in the AGP aperture ++ */ ++}; ++ ++/* ++ * DRM_IOCTL_INFO_BUFS ioctl argument type. ++ */ ++struct drm_buf_info { ++ int count; /**< Entries in list */ ++ struct drm_buf_desc *list; ++}; ++ ++/* ++ * DRM_IOCTL_FREE_BUFS ioctl argument type. ++ */ ++struct drm_buf_free { ++ int count; ++ int *list; ++}; ++ ++/* ++ * Buffer information ++ * ++ * \sa drm_buf_map. ++ */ ++struct drm_buf_pub { ++ int idx; /**< Index into the master buffer list */ ++ int total; /**< Buffer size */ ++ int used; /**< Amount of buffer in use (for DMA) */ ++ void *address; /**< Address of buffer */ ++}; ++ ++/* ++ * DRM_IOCTL_MAP_BUFS ioctl argument type. ++ */ ++struct drm_buf_map { ++ int count; /**< Length of the buffer list */ ++#ifdef __cplusplus ++ void *virt; ++#else ++ void *virtual; /**< Mmap'd area in user-virtual */ ++#endif ++ struct drm_buf_pub *list; /**< Buffer information */ ++}; ++ ++/* ++ * DRM_IOCTL_DMA ioctl argument type. ++ * ++ * Indices here refer to the offset into the buffer list in drm_buf_get. ++ * ++ * \sa drmDMA(). ++ */ ++struct drm_dma { ++ int context; /**< Context handle */ ++ int send_count; /**< Number of buffers to send */ ++ int *send_indices; /**< List of handles to buffers */ ++ int *send_sizes; /**< Lengths of data to send */ ++ enum drm_dma_flags flags; /**< Flags */ ++ int request_count; /**< Number of buffers requested */ ++ int request_size; /**< Desired size for buffers */ ++ int *request_indices; /**< Buffer information */ ++ int *request_sizes; ++ int granted_count; /**< Number of buffers granted */ ++}; ++ ++enum drm_ctx_flags { ++ _DRM_CONTEXT_PRESERVED = 0x01, ++ _DRM_CONTEXT_2DONLY = 0x02 ++}; ++ ++/* ++ * DRM_IOCTL_ADD_CTX ioctl argument type. ++ * ++ * \sa drmCreateContext() and drmDestroyContext(). ++ */ ++struct drm_ctx { ++ drm_context_t handle; ++ enum drm_ctx_flags flags; ++}; ++ ++/* ++ * DRM_IOCTL_RES_CTX ioctl argument type. ++ */ ++struct drm_ctx_res { ++ int count; ++ struct drm_ctx *contexts; ++}; ++ ++/* ++ * DRM_IOCTL_ADD_DRAW and DRM_IOCTL_RM_DRAW ioctl argument type. ++ */ ++struct drm_draw { ++ drm_drawable_t handle; ++}; ++ ++/* ++ * DRM_IOCTL_UPDATE_DRAW ioctl argument type. ++ */ ++typedef enum { ++ DRM_DRAWABLE_CLIPRECTS ++} drm_drawable_info_type_t; ++ ++struct drm_update_draw { ++ drm_drawable_t handle; ++ unsigned int type; ++ unsigned int num; ++ unsigned long long data; ++}; ++ ++/* ++ * DRM_IOCTL_GET_MAGIC and DRM_IOCTL_AUTH_MAGIC ioctl argument type. ++ */ ++struct drm_auth { ++ drm_magic_t magic; ++}; ++ ++/* ++ * DRM_IOCTL_IRQ_BUSID ioctl argument type. ++ * ++ * \sa drmGetInterruptFromBusID(). ++ */ ++struct drm_irq_busid { ++ int irq; /**< IRQ number */ ++ int busnum; /**< bus number */ ++ int devnum; /**< device number */ ++ int funcnum; /**< function number */ ++}; ++ ++enum drm_vblank_seq_type { ++ _DRM_VBLANK_ABSOLUTE = 0x0, /**< Wait for specific vblank sequence number */ ++ _DRM_VBLANK_RELATIVE = 0x1, /**< Wait for given number of vblanks */ ++ /* bits 1-6 are reserved for high crtcs */ ++ _DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e, ++ _DRM_VBLANK_EVENT = 0x4000000, /**< Send event instead of blocking */ ++ _DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ ++ _DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ ++ _DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ ++ _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking, unsupported */ ++}; ++#define _DRM_VBLANK_HIGH_CRTC_SHIFT 1 ++ ++#define _DRM_VBLANK_TYPES_MASK (_DRM_VBLANK_ABSOLUTE | _DRM_VBLANK_RELATIVE) ++#define _DRM_VBLANK_FLAGS_MASK (_DRM_VBLANK_EVENT | _DRM_VBLANK_SIGNAL | \ ++ _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS) ++ ++struct drm_wait_vblank_request { ++ enum drm_vblank_seq_type type; ++ unsigned int sequence; ++ unsigned long signal; ++}; ++ ++struct drm_wait_vblank_reply { ++ enum drm_vblank_seq_type type; ++ unsigned int sequence; ++ long tval_sec; ++ long tval_usec; ++}; ++ ++/* ++ * DRM_IOCTL_WAIT_VBLANK ioctl argument type. ++ * ++ * \sa drmWaitVBlank(). ++ */ ++union drm_wait_vblank { ++ struct drm_wait_vblank_request request; ++ struct drm_wait_vblank_reply reply; ++}; ++ ++#define _DRM_PRE_MODESET 1 ++#define _DRM_POST_MODESET 2 ++ ++/* ++ * DRM_IOCTL_MODESET_CTL ioctl argument type ++ * ++ * \sa drmModesetCtl(). ++ */ ++struct drm_modeset_ctl { ++ __u32 crtc; ++ __u32 cmd; ++}; ++ ++/* ++ * DRM_IOCTL_AGP_ENABLE ioctl argument type. ++ * ++ * \sa drmAgpEnable(). ++ */ ++struct drm_agp_mode { ++ unsigned long mode; /**< AGP mode */ ++}; ++ ++/* ++ * DRM_IOCTL_AGP_ALLOC and DRM_IOCTL_AGP_FREE ioctls argument type. ++ * ++ * \sa drmAgpAlloc() and drmAgpFree(). ++ */ ++struct drm_agp_buffer { ++ unsigned long size; /**< In bytes -- will round to page boundary */ ++ unsigned long handle; /**< Used for binding / unbinding */ ++ unsigned long type; /**< Type of memory to allocate */ ++ unsigned long physical; /**< Physical used by i810 */ ++}; ++ ++/* ++ * DRM_IOCTL_AGP_BIND and DRM_IOCTL_AGP_UNBIND ioctls argument type. ++ * ++ * \sa drmAgpBind() and drmAgpUnbind(). ++ */ ++struct drm_agp_binding { ++ unsigned long handle; /**< From drm_agp_buffer */ ++ unsigned long offset; /**< In bytes -- will round to page boundary */ ++}; ++ ++/* ++ * DRM_IOCTL_AGP_INFO ioctl argument type. ++ * ++ * \sa drmAgpVersionMajor(), drmAgpVersionMinor(), drmAgpGetMode(), ++ * drmAgpBase(), drmAgpSize(), drmAgpMemoryUsed(), drmAgpMemoryAvail(), ++ * drmAgpVendorId() and drmAgpDeviceId(). ++ */ ++struct drm_agp_info { ++ int agp_version_major; ++ int agp_version_minor; ++ unsigned long mode; ++ unsigned long aperture_base; /* physical address */ ++ unsigned long aperture_size; /* bytes */ ++ unsigned long memory_allowed; /* bytes */ ++ unsigned long memory_used; ++ ++ /* PCI information */ ++ unsigned short id_vendor; ++ unsigned short id_device; ++}; ++ ++/* ++ * DRM_IOCTL_SG_ALLOC ioctl argument type. ++ */ ++struct drm_scatter_gather { ++ unsigned long size; /**< In bytes -- will round to page boundary */ ++ unsigned long handle; /**< Used for mapping / unmapping */ ++}; ++ ++/* ++ * DRM_IOCTL_SET_VERSION ioctl argument type. ++ */ ++struct drm_set_version { ++ int drm_di_major; ++ int drm_di_minor; ++ int drm_dd_major; ++ int drm_dd_minor; ++}; ++ ++/* DRM_IOCTL_GEM_CLOSE ioctl argument type */ ++struct drm_gem_close { ++ /** Handle of the object to be closed. */ ++ __u32 handle; ++ __u32 pad; ++}; ++ ++/* DRM_IOCTL_GEM_FLINK ioctl argument type */ ++struct drm_gem_flink { ++ /** Handle for the object being named */ ++ __u32 handle; ++ ++ /** Returned global name */ ++ __u32 name; ++}; ++ ++/* DRM_IOCTL_GEM_OPEN ioctl argument type */ ++struct drm_gem_open { ++ /** Name of object being opened */ ++ __u32 name; ++ ++ /** Returned handle for the object */ ++ __u32 handle; ++ ++ /** Returned size of the object */ ++ __u64 size; ++}; ++ ++/** ++ * DRM_CAP_DUMB_BUFFER ++ * ++ * If set to 1, the driver supports creating dumb buffers via the ++ * &DRM_IOCTL_MODE_CREATE_DUMB ioctl. ++ */ ++#define DRM_CAP_DUMB_BUFFER 0x1 ++/** ++ * DRM_CAP_VBLANK_HIGH_CRTC ++ * ++ * If set to 1, the kernel supports specifying a :ref:`CRTC index` ++ * in the high bits of &drm_wait_vblank_request.type. ++ * ++ * Starting kernel version 2.6.39, this capability is always set to 1. ++ */ ++#define DRM_CAP_VBLANK_HIGH_CRTC 0x2 ++/** ++ * DRM_CAP_DUMB_PREFERRED_DEPTH ++ * ++ * The preferred bit depth for dumb buffers. ++ * ++ * The bit depth is the number of bits used to indicate the color of a single ++ * pixel excluding any padding. This is different from the number of bits per ++ * pixel. For instance, XRGB8888 has a bit depth of 24 but has 32 bits per ++ * pixel. ++ * ++ * Note that this preference only applies to dumb buffers, it's irrelevant for ++ * other types of buffers. ++ */ ++#define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3 ++/** ++ * DRM_CAP_DUMB_PREFER_SHADOW ++ * ++ * If set to 1, the driver prefers userspace to render to a shadow buffer ++ * instead of directly rendering to a dumb buffer. For best speed, userspace ++ * should do streaming ordered memory copies into the dumb buffer and never ++ * read from it. ++ * ++ * Note that this preference only applies to dumb buffers, it's irrelevant for ++ * other types of buffers. ++ */ ++#define DRM_CAP_DUMB_PREFER_SHADOW 0x4 ++/** ++ * DRM_CAP_PRIME ++ * ++ * Bitfield of supported PRIME sharing capabilities. See &DRM_PRIME_CAP_IMPORT ++ * and &DRM_PRIME_CAP_EXPORT. ++ * ++ * PRIME buffers are exposed as dma-buf file descriptors. See ++ * Documentation/gpu/drm-mm.rst, section "PRIME Buffer Sharing". ++ */ ++#define DRM_CAP_PRIME 0x5 ++/** ++ * DRM_PRIME_CAP_IMPORT ++ * ++ * If this bit is set in &DRM_CAP_PRIME, the driver supports importing PRIME ++ * buffers via the &DRM_IOCTL_PRIME_FD_TO_HANDLE ioctl. ++ */ ++#define DRM_PRIME_CAP_IMPORT 0x1 ++/** ++ * DRM_PRIME_CAP_EXPORT ++ * ++ * If this bit is set in &DRM_CAP_PRIME, the driver supports exporting PRIME ++ * buffers via the &DRM_IOCTL_PRIME_HANDLE_TO_FD ioctl. ++ */ ++#define DRM_PRIME_CAP_EXPORT 0x2 ++/** ++ * DRM_CAP_TIMESTAMP_MONOTONIC ++ * ++ * If set to 0, the kernel will report timestamps with ``CLOCK_REALTIME`` in ++ * struct drm_event_vblank. If set to 1, the kernel will report timestamps with ++ * ``CLOCK_MONOTONIC``. See ``clock_gettime(2)`` for the definition of these ++ * clocks. ++ * ++ * Starting from kernel version 2.6.39, the default value for this capability ++ * is 1. Starting kernel version 4.15, this capability is always set to 1. ++ */ ++#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 ++/** ++ * DRM_CAP_ASYNC_PAGE_FLIP ++ * ++ * If set to 1, the driver supports &DRM_MODE_PAGE_FLIP_ASYNC. ++ */ ++#define DRM_CAP_ASYNC_PAGE_FLIP 0x7 ++/** ++ * DRM_CAP_CURSOR_WIDTH ++ * ++ * The ``CURSOR_WIDTH`` and ``CURSOR_HEIGHT`` capabilities return a valid ++ * width x height combination for the hardware cursor. The intention is that a ++ * hardware agnostic userspace can query a cursor plane size to use. ++ * ++ * Note that the cross-driver contract is to merely return a valid size; ++ * drivers are free to attach another meaning on top, eg. i915 returns the ++ * maximum plane size. ++ */ ++#define DRM_CAP_CURSOR_WIDTH 0x8 ++/** ++ * DRM_CAP_CURSOR_HEIGHT ++ * ++ * See &DRM_CAP_CURSOR_WIDTH. ++ */ ++#define DRM_CAP_CURSOR_HEIGHT 0x9 ++/** ++ * DRM_CAP_ADDFB2_MODIFIERS ++ * ++ * If set to 1, the driver supports supplying modifiers in the ++ * &DRM_IOCTL_MODE_ADDFB2 ioctl. ++ */ ++#define DRM_CAP_ADDFB2_MODIFIERS 0x10 ++/** ++ * DRM_CAP_PAGE_FLIP_TARGET ++ * ++ * If set to 1, the driver supports the &DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE and ++ * &DRM_MODE_PAGE_FLIP_TARGET_RELATIVE flags in ++ * &drm_mode_crtc_page_flip_target.flags for the &DRM_IOCTL_MODE_PAGE_FLIP ++ * ioctl. ++ */ ++#define DRM_CAP_PAGE_FLIP_TARGET 0x11 ++/** ++ * DRM_CAP_CRTC_IN_VBLANK_EVENT ++ * ++ * If set to 1, the kernel supports reporting the CRTC ID in ++ * &drm_event_vblank.crtc_id for the &DRM_EVENT_VBLANK and ++ * &DRM_EVENT_FLIP_COMPLETE events. ++ * ++ * Starting kernel version 4.12, this capability is always set to 1. ++ */ ++#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12 ++/** ++ * DRM_CAP_SYNCOBJ ++ * ++ * If set to 1, the driver supports sync objects. See ++ * Documentation/gpu/drm-mm.rst, section "DRM Sync Objects". ++ */ ++#define DRM_CAP_SYNCOBJ 0x13 ++/** ++ * DRM_CAP_SYNCOBJ_TIMELINE ++ * ++ * If set to 1, the driver supports timeline operations on sync objects. See ++ * Documentation/gpu/drm-mm.rst, section "DRM Sync Objects". ++ */ ++#define DRM_CAP_SYNCOBJ_TIMELINE 0x14 ++ ++/* DRM_IOCTL_GET_CAP ioctl argument type */ ++struct drm_get_cap { ++ __u64 capability; ++ __u64 value; ++}; ++ ++/** ++ * DRM_CLIENT_CAP_STEREO_3D ++ * ++ * If set to 1, the DRM core will expose the stereo 3D capabilities of the ++ * monitor by advertising the supported 3D layouts in the flags of struct ++ * drm_mode_modeinfo. See ``DRM_MODE_FLAG_3D_*``. ++ * ++ * This capability is always supported for all drivers starting from kernel ++ * version 3.13. ++ */ ++#define DRM_CLIENT_CAP_STEREO_3D 1 ++ ++/** ++ * DRM_CLIENT_CAP_UNIVERSAL_PLANES ++ * ++ * If set to 1, the DRM core will expose all planes (overlay, primary, and ++ * cursor) to userspace. ++ * ++ * This capability has been introduced in kernel version 3.15. Starting from ++ * kernel version 3.17, this capability is always supported for all drivers. ++ */ ++#define DRM_CLIENT_CAP_UNIVERSAL_PLANES 2 ++ ++/** ++ * DRM_CLIENT_CAP_ATOMIC ++ * ++ * If set to 1, the DRM core will expose atomic properties to userspace. This ++ * implicitly enables &DRM_CLIENT_CAP_UNIVERSAL_PLANES and ++ * &DRM_CLIENT_CAP_ASPECT_RATIO. ++ * ++ * If the driver doesn't support atomic mode-setting, enabling this capability ++ * will fail with -EOPNOTSUPP. ++ * ++ * This capability has been introduced in kernel version 4.0. Starting from ++ * kernel version 4.2, this capability is always supported for atomic-capable ++ * drivers. ++ */ ++#define DRM_CLIENT_CAP_ATOMIC 3 ++ ++/** ++ * DRM_CLIENT_CAP_ASPECT_RATIO ++ * ++ * If set to 1, the DRM core will provide aspect ratio information in modes. ++ * See ``DRM_MODE_FLAG_PIC_AR_*``. ++ * ++ * This capability is always supported for all drivers starting from kernel ++ * version 4.18. ++ */ ++#define DRM_CLIENT_CAP_ASPECT_RATIO 4 ++ ++/** ++ * DRM_CLIENT_CAP_WRITEBACK_CONNECTORS ++ * ++ * If set to 1, the DRM core will expose special connectors to be used for ++ * writing back to memory the scene setup in the commit. The client must enable ++ * &DRM_CLIENT_CAP_ATOMIC first. ++ * ++ * This capability is always supported for atomic-capable drivers starting from ++ * kernel version 4.19. ++ */ ++#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5 ++ ++/* DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ ++struct drm_set_client_cap { ++ __u64 capability; ++ __u64 value; ++}; ++ ++#define DRM_RDWR O_RDWR ++#define DRM_CLOEXEC O_CLOEXEC ++struct drm_prime_handle { ++ __u32 handle; ++ ++ /** Flags.. only applicable for handle->fd */ ++ __u32 flags; ++ ++ /** Returned dmabuf file descriptor */ ++ __s32 fd; ++}; ++ ++struct drm_syncobj_create { ++ __u32 handle; ++#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0) ++ __u32 flags; ++}; ++ ++struct drm_syncobj_destroy { ++ __u32 handle; ++ __u32 pad; ++}; ++ ++#define DRM_SYNCOBJ_FD_TO_HANDLE_FLAGS_IMPORT_SYNC_FILE (1 << 0) ++#define DRM_SYNCOBJ_HANDLE_TO_FD_FLAGS_EXPORT_SYNC_FILE (1 << 0) ++struct drm_syncobj_handle { ++ __u32 handle; ++ __u32 flags; ++ ++ __s32 fd; ++ __u32 pad; ++}; ++ ++struct drm_syncobj_transfer { ++ __u32 src_handle; ++ __u32 dst_handle; ++ __u64 src_point; ++ __u64 dst_point; ++ __u32 flags; ++ __u32 pad; ++}; ++ ++#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0) ++#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1) ++#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE (1 << 2) /* wait for time point to become available */ ++struct drm_syncobj_wait { ++ __u64 handles; ++ /* absolute timeout */ ++ __s64 timeout_nsec; ++ __u32 count_handles; ++ __u32 flags; ++ __u32 first_signaled; /* only valid when not waiting all */ ++ __u32 pad; ++}; ++ ++struct drm_syncobj_timeline_wait { ++ __u64 handles; ++ /* wait on specific timeline point for every handles*/ ++ __u64 points; ++ /* absolute timeout */ ++ __s64 timeout_nsec; ++ __u32 count_handles; ++ __u32 flags; ++ __u32 first_signaled; /* only valid when not waiting all */ ++ __u32 pad; ++}; ++ ++ ++struct drm_syncobj_array { ++ __u64 handles; ++ __u32 count_handles; ++ __u32 pad; ++}; ++ ++#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */ ++struct drm_syncobj_timeline_array { ++ __u64 handles; ++ __u64 points; ++ __u32 count_handles; ++ __u32 flags; ++}; ++ ++ ++/* Query current scanout sequence number */ ++struct drm_crtc_get_sequence { ++ __u32 crtc_id; /* requested crtc_id */ ++ __u32 active; /* return: crtc output is active */ ++ __u64 sequence; /* return: most recent vblank sequence */ ++ __s64 sequence_ns; /* return: most recent time of first pixel out */ ++}; ++ ++/* Queue event to be delivered at specified sequence. Time stamp marks ++ * when the first pixel of the refresh cycle leaves the display engine ++ * for the display ++ */ ++#define DRM_CRTC_SEQUENCE_RELATIVE 0x00000001 /* sequence is relative to current */ ++#define DRM_CRTC_SEQUENCE_NEXT_ON_MISS 0x00000002 /* Use next sequence if we've missed */ ++ ++struct drm_crtc_queue_sequence { ++ __u32 crtc_id; ++ __u32 flags; ++ __u64 sequence; /* on input, target sequence. on output, actual sequence */ ++ __u64 user_data; /* user data passed to event */ ++}; ++ ++#if defined(__cplusplus) ++} ++#endif ++ ++#include "drm_mode.h" ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++#define DRM_IOCTL_BASE 'd' ++#define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) ++#define DRM_IOR(nr,type) _IOR(DRM_IOCTL_BASE,nr,type) ++#define DRM_IOW(nr,type) _IOW(DRM_IOCTL_BASE,nr,type) ++#define DRM_IOWR(nr,type) _IOWR(DRM_IOCTL_BASE,nr,type) ++ ++#define DRM_IOCTL_VERSION DRM_IOWR(0x00, struct drm_version) ++#define DRM_IOCTL_GET_UNIQUE DRM_IOWR(0x01, struct drm_unique) ++#define DRM_IOCTL_GET_MAGIC DRM_IOR( 0x02, struct drm_auth) ++#define DRM_IOCTL_IRQ_BUSID DRM_IOWR(0x03, struct drm_irq_busid) ++#define DRM_IOCTL_GET_MAP DRM_IOWR(0x04, struct drm_map) ++#define DRM_IOCTL_GET_CLIENT DRM_IOWR(0x05, struct drm_client) ++#define DRM_IOCTL_GET_STATS DRM_IOR( 0x06, struct drm_stats) ++#define DRM_IOCTL_SET_VERSION DRM_IOWR(0x07, struct drm_set_version) ++#define DRM_IOCTL_MODESET_CTL DRM_IOW(0x08, struct drm_modeset_ctl) ++#define DRM_IOCTL_GEM_CLOSE DRM_IOW (0x09, struct drm_gem_close) ++#define DRM_IOCTL_GEM_FLINK DRM_IOWR(0x0a, struct drm_gem_flink) ++#define DRM_IOCTL_GEM_OPEN DRM_IOWR(0x0b, struct drm_gem_open) ++#define DRM_IOCTL_GET_CAP DRM_IOWR(0x0c, struct drm_get_cap) ++#define DRM_IOCTL_SET_CLIENT_CAP DRM_IOW( 0x0d, struct drm_set_client_cap) ++ ++#define DRM_IOCTL_SET_UNIQUE DRM_IOW( 0x10, struct drm_unique) ++#define DRM_IOCTL_AUTH_MAGIC DRM_IOW( 0x11, struct drm_auth) ++#define DRM_IOCTL_BLOCK DRM_IOWR(0x12, struct drm_block) ++#define DRM_IOCTL_UNBLOCK DRM_IOWR(0x13, struct drm_block) ++#define DRM_IOCTL_CONTROL DRM_IOW( 0x14, struct drm_control) ++#define DRM_IOCTL_ADD_MAP DRM_IOWR(0x15, struct drm_map) ++#define DRM_IOCTL_ADD_BUFS DRM_IOWR(0x16, struct drm_buf_desc) ++#define DRM_IOCTL_MARK_BUFS DRM_IOW( 0x17, struct drm_buf_desc) ++#define DRM_IOCTL_INFO_BUFS DRM_IOWR(0x18, struct drm_buf_info) ++#define DRM_IOCTL_MAP_BUFS DRM_IOWR(0x19, struct drm_buf_map) ++#define DRM_IOCTL_FREE_BUFS DRM_IOW( 0x1a, struct drm_buf_free) ++ ++#define DRM_IOCTL_RM_MAP DRM_IOW( 0x1b, struct drm_map) ++ ++#define DRM_IOCTL_SET_SAREA_CTX DRM_IOW( 0x1c, struct drm_ctx_priv_map) ++#define DRM_IOCTL_GET_SAREA_CTX DRM_IOWR(0x1d, struct drm_ctx_priv_map) ++ ++#define DRM_IOCTL_SET_MASTER DRM_IO(0x1e) ++#define DRM_IOCTL_DROP_MASTER DRM_IO(0x1f) ++ ++#define DRM_IOCTL_ADD_CTX DRM_IOWR(0x20, struct drm_ctx) ++#define DRM_IOCTL_RM_CTX DRM_IOWR(0x21, struct drm_ctx) ++#define DRM_IOCTL_MOD_CTX DRM_IOW( 0x22, struct drm_ctx) ++#define DRM_IOCTL_GET_CTX DRM_IOWR(0x23, struct drm_ctx) ++#define DRM_IOCTL_SWITCH_CTX DRM_IOW( 0x24, struct drm_ctx) ++#define DRM_IOCTL_NEW_CTX DRM_IOW( 0x25, struct drm_ctx) ++#define DRM_IOCTL_RES_CTX DRM_IOWR(0x26, struct drm_ctx_res) ++#define DRM_IOCTL_ADD_DRAW DRM_IOWR(0x27, struct drm_draw) ++#define DRM_IOCTL_RM_DRAW DRM_IOWR(0x28, struct drm_draw) ++#define DRM_IOCTL_DMA DRM_IOWR(0x29, struct drm_dma) ++#define DRM_IOCTL_LOCK DRM_IOW( 0x2a, struct drm_lock) ++#define DRM_IOCTL_UNLOCK DRM_IOW( 0x2b, struct drm_lock) ++#define DRM_IOCTL_FINISH DRM_IOW( 0x2c, struct drm_lock) ++ ++#define DRM_IOCTL_PRIME_HANDLE_TO_FD DRM_IOWR(0x2d, struct drm_prime_handle) ++#define DRM_IOCTL_PRIME_FD_TO_HANDLE DRM_IOWR(0x2e, struct drm_prime_handle) ++ ++#define DRM_IOCTL_AGP_ACQUIRE DRM_IO( 0x30) ++#define DRM_IOCTL_AGP_RELEASE DRM_IO( 0x31) ++#define DRM_IOCTL_AGP_ENABLE DRM_IOW( 0x32, struct drm_agp_mode) ++#define DRM_IOCTL_AGP_INFO DRM_IOR( 0x33, struct drm_agp_info) ++#define DRM_IOCTL_AGP_ALLOC DRM_IOWR(0x34, struct drm_agp_buffer) ++#define DRM_IOCTL_AGP_FREE DRM_IOW( 0x35, struct drm_agp_buffer) ++#define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) ++#define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) ++ ++#define DRM_IOCTL_SG_ALLOC DRM_IOWR(0x38, struct drm_scatter_gather) ++#define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) ++ ++#define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) ++ ++#define DRM_IOCTL_CRTC_GET_SEQUENCE DRM_IOWR(0x3b, struct drm_crtc_get_sequence) ++#define DRM_IOCTL_CRTC_QUEUE_SEQUENCE DRM_IOWR(0x3c, struct drm_crtc_queue_sequence) ++ ++#define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) ++ ++#define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res) ++#define DRM_IOCTL_MODE_GETCRTC DRM_IOWR(0xA1, struct drm_mode_crtc) ++#define DRM_IOCTL_MODE_SETCRTC DRM_IOWR(0xA2, struct drm_mode_crtc) ++#define DRM_IOCTL_MODE_CURSOR DRM_IOWR(0xA3, struct drm_mode_cursor) ++#define DRM_IOCTL_MODE_GETGAMMA DRM_IOWR(0xA4, struct drm_mode_crtc_lut) ++#define DRM_IOCTL_MODE_SETGAMMA DRM_IOWR(0xA5, struct drm_mode_crtc_lut) ++#define DRM_IOCTL_MODE_GETENCODER DRM_IOWR(0xA6, struct drm_mode_get_encoder) ++#define DRM_IOCTL_MODE_GETCONNECTOR DRM_IOWR(0xA7, struct drm_mode_get_connector) ++#define DRM_IOCTL_MODE_ATTACHMODE DRM_IOWR(0xA8, struct drm_mode_mode_cmd) /* deprecated (never worked) */ ++#define DRM_IOCTL_MODE_DETACHMODE DRM_IOWR(0xA9, struct drm_mode_mode_cmd) /* deprecated (never worked) */ ++ ++#define DRM_IOCTL_MODE_GETPROPERTY DRM_IOWR(0xAA, struct drm_mode_get_property) ++#define DRM_IOCTL_MODE_SETPROPERTY DRM_IOWR(0xAB, struct drm_mode_connector_set_property) ++#define DRM_IOCTL_MODE_GETPROPBLOB DRM_IOWR(0xAC, struct drm_mode_get_blob) ++#define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xAD, struct drm_mode_fb_cmd) ++#define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xAE, struct drm_mode_fb_cmd) ++/** ++ * DRM_IOCTL_MODE_RMFB - Remove a framebuffer. ++ * ++ * This removes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL ++ * argument is a framebuffer object ID. ++ * ++ * Warning: removing a framebuffer currently in-use on an enabled plane will ++ * disable that plane. The CRTC the plane is linked to may also be disabled ++ * (depending on driver capabilities). ++ */ ++#define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xAF, unsigned int) ++#define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip) ++#define DRM_IOCTL_MODE_DIRTYFB DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd) ++ ++#define DRM_IOCTL_MODE_CREATE_DUMB DRM_IOWR(0xB2, struct drm_mode_create_dumb) ++#define DRM_IOCTL_MODE_MAP_DUMB DRM_IOWR(0xB3, struct drm_mode_map_dumb) ++#define DRM_IOCTL_MODE_DESTROY_DUMB DRM_IOWR(0xB4, struct drm_mode_destroy_dumb) ++#define DRM_IOCTL_MODE_GETPLANERESOURCES DRM_IOWR(0xB5, struct drm_mode_get_plane_res) ++#define DRM_IOCTL_MODE_GETPLANE DRM_IOWR(0xB6, struct drm_mode_get_plane) ++#define DRM_IOCTL_MODE_SETPLANE DRM_IOWR(0xB7, struct drm_mode_set_plane) ++#define DRM_IOCTL_MODE_ADDFB2 DRM_IOWR(0xB8, struct drm_mode_fb_cmd2) ++#define DRM_IOCTL_MODE_OBJ_GETPROPERTIES DRM_IOWR(0xB9, struct drm_mode_obj_get_properties) ++#define DRM_IOCTL_MODE_OBJ_SETPROPERTY DRM_IOWR(0xBA, struct drm_mode_obj_set_property) ++#define DRM_IOCTL_MODE_CURSOR2 DRM_IOWR(0xBB, struct drm_mode_cursor2) ++#define DRM_IOCTL_MODE_ATOMIC DRM_IOWR(0xBC, struct drm_mode_atomic) ++#define DRM_IOCTL_MODE_CREATEPROPBLOB DRM_IOWR(0xBD, struct drm_mode_create_blob) ++#define DRM_IOCTL_MODE_DESTROYPROPBLOB DRM_IOWR(0xBE, struct drm_mode_destroy_blob) ++ ++#define DRM_IOCTL_SYNCOBJ_CREATE DRM_IOWR(0xBF, struct drm_syncobj_create) ++#define DRM_IOCTL_SYNCOBJ_DESTROY DRM_IOWR(0xC0, struct drm_syncobj_destroy) ++#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD DRM_IOWR(0xC1, struct drm_syncobj_handle) ++#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE DRM_IOWR(0xC2, struct drm_syncobj_handle) ++#define DRM_IOCTL_SYNCOBJ_WAIT DRM_IOWR(0xC3, struct drm_syncobj_wait) ++#define DRM_IOCTL_SYNCOBJ_RESET DRM_IOWR(0xC4, struct drm_syncobj_array) ++#define DRM_IOCTL_SYNCOBJ_SIGNAL DRM_IOWR(0xC5, struct drm_syncobj_array) ++ ++#define DRM_IOCTL_MODE_CREATE_LEASE DRM_IOWR(0xC6, struct drm_mode_create_lease) ++#define DRM_IOCTL_MODE_LIST_LESSEES DRM_IOWR(0xC7, struct drm_mode_list_lessees) ++#define DRM_IOCTL_MODE_GET_LEASE DRM_IOWR(0xC8, struct drm_mode_get_lease) ++#define DRM_IOCTL_MODE_REVOKE_LEASE DRM_IOWR(0xC9, struct drm_mode_revoke_lease) ++ ++#define DRM_IOCTL_SYNCOBJ_TIMELINE_WAIT DRM_IOWR(0xCA, struct drm_syncobj_timeline_wait) ++#define DRM_IOCTL_SYNCOBJ_QUERY DRM_IOWR(0xCB, struct drm_syncobj_timeline_array) ++#define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer) ++#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_timeline_array) ++ ++#define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2) ++ ++/* ++ * Device specific ioctls should only be in their respective headers ++ * The device specific ioctl range is from 0x40 to 0x9f. ++ * Generic IOCTLS restart at 0xA0. ++ * ++ * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and ++ * drmCommandReadWrite(). ++ */ ++#define DRM_COMMAND_BASE 0x40 ++#define DRM_COMMAND_END 0xA0 ++ ++/* ++ * Header for events written back to userspace on the drm fd. The ++ * type defines the type of event, the length specifies the total ++ * length of the event (including the header), and user_data is ++ * typically a 64 bit value passed with the ioctl that triggered the ++ * event. A read on the drm fd will always only return complete ++ * events, that is, if for example the read buffer is 100 bytes, and ++ * there are two 64 byte events pending, only one will be returned. ++ * ++ * Event types 0 - 0x7fffffff are generic drm events, 0x80000000 and ++ * up are chipset specific. ++ */ ++struct drm_event { ++ __u32 type; ++ __u32 length; ++}; ++ ++#define DRM_EVENT_VBLANK 0x01 ++#define DRM_EVENT_FLIP_COMPLETE 0x02 ++#define DRM_EVENT_CRTC_SEQUENCE 0x03 ++ ++struct drm_event_vblank { ++ struct drm_event base; ++ __u64 user_data; ++ __u32 tv_sec; ++ __u32 tv_usec; ++ __u32 sequence; ++ __u32 crtc_id; /* 0 on older kernels that do not support this */ ++}; ++ ++/* Event delivered at sequence. Time stamp marks when the first pixel ++ * of the refresh cycle leaves the display engine for the display ++ */ ++struct drm_event_crtc_sequence { ++ struct drm_event base; ++ __u64 user_data; ++ __s64 time_ns; ++ __u64 sequence; ++}; ++ ++/* typedef area */ ++typedef struct drm_clip_rect drm_clip_rect_t; ++typedef struct drm_drawable_info drm_drawable_info_t; ++typedef struct drm_tex_region drm_tex_region_t; ++typedef struct drm_hw_lock drm_hw_lock_t; ++typedef struct drm_version drm_version_t; ++typedef struct drm_unique drm_unique_t; ++typedef struct drm_list drm_list_t; ++typedef struct drm_block drm_block_t; ++typedef struct drm_control drm_control_t; ++typedef enum drm_map_type drm_map_type_t; ++typedef enum drm_map_flags drm_map_flags_t; ++typedef struct drm_ctx_priv_map drm_ctx_priv_map_t; ++typedef struct drm_map drm_map_t; ++typedef struct drm_client drm_client_t; ++typedef enum drm_stat_type drm_stat_type_t; ++typedef struct drm_stats drm_stats_t; ++typedef enum drm_lock_flags drm_lock_flags_t; ++typedef struct drm_lock drm_lock_t; ++typedef enum drm_dma_flags drm_dma_flags_t; ++typedef struct drm_buf_desc drm_buf_desc_t; ++typedef struct drm_buf_info drm_buf_info_t; ++typedef struct drm_buf_free drm_buf_free_t; ++typedef struct drm_buf_pub drm_buf_pub_t; ++typedef struct drm_buf_map drm_buf_map_t; ++typedef struct drm_dma drm_dma_t; ++typedef union drm_wait_vblank drm_wait_vblank_t; ++typedef struct drm_agp_mode drm_agp_mode_t; ++typedef enum drm_ctx_flags drm_ctx_flags_t; ++typedef struct drm_ctx drm_ctx_t; ++typedef struct drm_ctx_res drm_ctx_res_t; ++typedef struct drm_draw drm_draw_t; ++typedef struct drm_update_draw drm_update_draw_t; ++typedef struct drm_auth drm_auth_t; ++typedef struct drm_irq_busid drm_irq_busid_t; ++typedef enum drm_vblank_seq_type drm_vblank_seq_type_t; ++ ++typedef struct drm_agp_buffer drm_agp_buffer_t; ++typedef struct drm_agp_binding drm_agp_binding_t; ++typedef struct drm_agp_info drm_agp_info_t; ++typedef struct drm_scatter_gather drm_scatter_gather_t; ++typedef struct drm_set_version drm_set_version_t; ++ ++#if defined(__cplusplus) ++} ++#endif ++ ++#endif +diff --git a/third_party/drm/drm/drm_fourcc.h b/third_party/drm/drm/drm_fourcc.h +new file mode 100644 +index 000000000000..4ececa84baa6 +--- /dev/null ++++ b/third_party/drm/drm/drm_fourcc.h +@@ -0,0 +1,1377 @@ ++/* ++ * Copyright 2011 Intel Corporation ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#ifndef DRM_FOURCC_H ++#define DRM_FOURCC_H ++ ++#include "drm.h" ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++/** ++ * DOC: overview ++ * ++ * In the DRM subsystem, framebuffer pixel formats are described using the ++ * fourcc codes defined in `include/uapi/drm/drm_fourcc.h`. In addition to the ++ * fourcc code, a Format Modifier may optionally be provided, in order to ++ * further describe the buffer's format - for example tiling or compression. ++ * ++ * Format Modifiers ++ * ---------------- ++ * ++ * Format modifiers are used in conjunction with a fourcc code, forming a ++ * unique fourcc:modifier pair. This format:modifier pair must fully define the ++ * format and data layout of the buffer, and should be the only way to describe ++ * that particular buffer. ++ * ++ * Having multiple fourcc:modifier pairs which describe the same layout should ++ * be avoided, as such aliases run the risk of different drivers exposing ++ * different names for the same data format, forcing userspace to understand ++ * that they are aliases. ++ * ++ * Format modifiers may change any property of the buffer, including the number ++ * of planes and/or the required allocation size. Format modifiers are ++ * vendor-namespaced, and as such the relationship between a fourcc code and a ++ * modifier is specific to the modifer being used. For example, some modifiers ++ * may preserve meaning - such as number of planes - from the fourcc code, ++ * whereas others may not. ++ * ++ * Modifiers must uniquely encode buffer layout. In other words, a buffer must ++ * match only a single modifier. A modifier must not be a subset of layouts of ++ * another modifier. For instance, it's incorrect to encode pitch alignment in ++ * a modifier: a buffer may match a 64-pixel aligned modifier and a 32-pixel ++ * aligned modifier. That said, modifiers can have implicit minimal ++ * requirements. ++ * ++ * For modifiers where the combination of fourcc code and modifier can alias, ++ * a canonical pair needs to be defined and used by all drivers. Preferred ++ * combinations are also encouraged where all combinations might lead to ++ * confusion and unnecessarily reduced interoperability. An example for the ++ * latter is AFBC, where the ABGR layouts are preferred over ARGB layouts. ++ * ++ * There are two kinds of modifier users: ++ * ++ * - Kernel and user-space drivers: for drivers it's important that modifiers ++ * don't alias, otherwise two drivers might support the same format but use ++ * different aliases, preventing them from sharing buffers in an efficient ++ * format. ++ * - Higher-level programs interfacing with KMS/GBM/EGL/Vulkan/etc: these users ++ * see modifiers as opaque tokens they can check for equality and intersect. ++ * These users musn't need to know to reason about the modifier value ++ * (i.e. they are not expected to extract information out of the modifier). ++ * ++ * Vendors should document their modifier usage in as much detail as ++ * possible, to ensure maximum compatibility across devices, drivers and ++ * applications. ++ * ++ * The authoritative list of format modifier codes is found in ++ * `include/uapi/drm/drm_fourcc.h` ++ */ ++ ++#define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ ++ ((__u32)(c) << 16) | ((__u32)(d) << 24)) ++ ++#define DRM_FORMAT_BIG_ENDIAN (1U<<31) /* format is big endian instead of little endian */ ++ ++/* Reserve 0 for the invalid format specifier */ ++#define DRM_FORMAT_INVALID 0 ++ ++/* color index */ ++#define DRM_FORMAT_C8 fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ ++ ++/* 8 bpp Red */ ++#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */ ++ ++/* 10 bpp Red */ ++#define DRM_FORMAT_R10 fourcc_code('R', '1', '0', ' ') /* [15:0] x:R 6:10 little endian */ ++ ++/* 12 bpp Red */ ++#define DRM_FORMAT_R12 fourcc_code('R', '1', '2', ' ') /* [15:0] x:R 4:12 little endian */ ++ ++/* 16 bpp Red */ ++#define DRM_FORMAT_R16 fourcc_code('R', '1', '6', ' ') /* [15:0] R little endian */ ++ ++/* 16 bpp RG */ ++#define DRM_FORMAT_RG88 fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */ ++#define DRM_FORMAT_GR88 fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */ ++ ++/* 32 bpp RG */ ++#define DRM_FORMAT_RG1616 fourcc_code('R', 'G', '3', '2') /* [31:0] R:G 16:16 little endian */ ++#define DRM_FORMAT_GR1616 fourcc_code('G', 'R', '3', '2') /* [31:0] G:R 16:16 little endian */ ++ ++/* 8 bpp RGB */ ++#define DRM_FORMAT_RGB332 fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */ ++#define DRM_FORMAT_BGR233 fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */ ++ ++/* 16 bpp RGB */ ++#define DRM_FORMAT_XRGB4444 fourcc_code('X', 'R', '1', '2') /* [15:0] x:R:G:B 4:4:4:4 little endian */ ++#define DRM_FORMAT_XBGR4444 fourcc_code('X', 'B', '1', '2') /* [15:0] x:B:G:R 4:4:4:4 little endian */ ++#define DRM_FORMAT_RGBX4444 fourcc_code('R', 'X', '1', '2') /* [15:0] R:G:B:x 4:4:4:4 little endian */ ++#define DRM_FORMAT_BGRX4444 fourcc_code('B', 'X', '1', '2') /* [15:0] B:G:R:x 4:4:4:4 little endian */ ++ ++#define DRM_FORMAT_ARGB4444 fourcc_code('A', 'R', '1', '2') /* [15:0] A:R:G:B 4:4:4:4 little endian */ ++#define DRM_FORMAT_ABGR4444 fourcc_code('A', 'B', '1', '2') /* [15:0] A:B:G:R 4:4:4:4 little endian */ ++#define DRM_FORMAT_RGBA4444 fourcc_code('R', 'A', '1', '2') /* [15:0] R:G:B:A 4:4:4:4 little endian */ ++#define DRM_FORMAT_BGRA4444 fourcc_code('B', 'A', '1', '2') /* [15:0] B:G:R:A 4:4:4:4 little endian */ ++ ++#define DRM_FORMAT_XRGB1555 fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */ ++#define DRM_FORMAT_XBGR1555 fourcc_code('X', 'B', '1', '5') /* [15:0] x:B:G:R 1:5:5:5 little endian */ ++#define DRM_FORMAT_RGBX5551 fourcc_code('R', 'X', '1', '5') /* [15:0] R:G:B:x 5:5:5:1 little endian */ ++#define DRM_FORMAT_BGRX5551 fourcc_code('B', 'X', '1', '5') /* [15:0] B:G:R:x 5:5:5:1 little endian */ ++ ++#define DRM_FORMAT_ARGB1555 fourcc_code('A', 'R', '1', '5') /* [15:0] A:R:G:B 1:5:5:5 little endian */ ++#define DRM_FORMAT_ABGR1555 fourcc_code('A', 'B', '1', '5') /* [15:0] A:B:G:R 1:5:5:5 little endian */ ++#define DRM_FORMAT_RGBA5551 fourcc_code('R', 'A', '1', '5') /* [15:0] R:G:B:A 5:5:5:1 little endian */ ++#define DRM_FORMAT_BGRA5551 fourcc_code('B', 'A', '1', '5') /* [15:0] B:G:R:A 5:5:5:1 little endian */ ++ ++#define DRM_FORMAT_RGB565 fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */ ++#define DRM_FORMAT_BGR565 fourcc_code('B', 'G', '1', '6') /* [15:0] B:G:R 5:6:5 little endian */ ++ ++/* 24 bpp RGB */ ++#define DRM_FORMAT_RGB888 fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */ ++#define DRM_FORMAT_BGR888 fourcc_code('B', 'G', '2', '4') /* [23:0] B:G:R little endian */ ++ ++/* 32 bpp RGB */ ++#define DRM_FORMAT_XRGB8888 fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */ ++#define DRM_FORMAT_XBGR8888 fourcc_code('X', 'B', '2', '4') /* [31:0] x:B:G:R 8:8:8:8 little endian */ ++#define DRM_FORMAT_RGBX8888 fourcc_code('R', 'X', '2', '4') /* [31:0] R:G:B:x 8:8:8:8 little endian */ ++#define DRM_FORMAT_BGRX8888 fourcc_code('B', 'X', '2', '4') /* [31:0] B:G:R:x 8:8:8:8 little endian */ ++ ++#define DRM_FORMAT_ARGB8888 fourcc_code('A', 'R', '2', '4') /* [31:0] A:R:G:B 8:8:8:8 little endian */ ++#define DRM_FORMAT_ABGR8888 fourcc_code('A', 'B', '2', '4') /* [31:0] A:B:G:R 8:8:8:8 little endian */ ++#define DRM_FORMAT_RGBA8888 fourcc_code('R', 'A', '2', '4') /* [31:0] R:G:B:A 8:8:8:8 little endian */ ++#define DRM_FORMAT_BGRA8888 fourcc_code('B', 'A', '2', '4') /* [31:0] B:G:R:A 8:8:8:8 little endian */ ++ ++#define DRM_FORMAT_XRGB2101010 fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */ ++#define DRM_FORMAT_XBGR2101010 fourcc_code('X', 'B', '3', '0') /* [31:0] x:B:G:R 2:10:10:10 little endian */ ++#define DRM_FORMAT_RGBX1010102 fourcc_code('R', 'X', '3', '0') /* [31:0] R:G:B:x 10:10:10:2 little endian */ ++#define DRM_FORMAT_BGRX1010102 fourcc_code('B', 'X', '3', '0') /* [31:0] B:G:R:x 10:10:10:2 little endian */ ++ ++#define DRM_FORMAT_ARGB2101010 fourcc_code('A', 'R', '3', '0') /* [31:0] A:R:G:B 2:10:10:10 little endian */ ++#define DRM_FORMAT_ABGR2101010 fourcc_code('A', 'B', '3', '0') /* [31:0] A:B:G:R 2:10:10:10 little endian */ ++#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */ ++#define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */ ++ ++/* 64 bpp RGB */ ++#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8') /* [63:0] x:R:G:B 16:16:16:16 little endian */ ++#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8') /* [63:0] x:B:G:R 16:16:16:16 little endian */ ++ ++#define DRM_FORMAT_ARGB16161616 fourcc_code('A', 'R', '4', '8') /* [63:0] A:R:G:B 16:16:16:16 little endian */ ++#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8') /* [63:0] A:B:G:R 16:16:16:16 little endian */ ++ ++/* ++ * Floating point 64bpp RGB ++ * IEEE 754-2008 binary16 half-precision float ++ * [15:0] sign:exponent:mantissa 1:5:10 ++ */ ++#define DRM_FORMAT_XRGB16161616F fourcc_code('X', 'R', '4', 'H') /* [63:0] x:R:G:B 16:16:16:16 little endian */ ++#define DRM_FORMAT_XBGR16161616F fourcc_code('X', 'B', '4', 'H') /* [63:0] x:B:G:R 16:16:16:16 little endian */ ++ ++#define DRM_FORMAT_ARGB16161616F fourcc_code('A', 'R', '4', 'H') /* [63:0] A:R:G:B 16:16:16:16 little endian */ ++#define DRM_FORMAT_ABGR16161616F fourcc_code('A', 'B', '4', 'H') /* [63:0] A:B:G:R 16:16:16:16 little endian */ ++ ++/* ++ * RGBA format with 10-bit components packed in 64-bit per pixel, with 6 bits ++ * of unused padding per component: ++ */ ++#define DRM_FORMAT_AXBXGXRX106106106106 fourcc_code('A', 'B', '1', '0') /* [63:0] A:x:B:x:G:x:R:x 10:6:10:6:10:6:10:6 little endian */ ++ ++/* packed YCbCr */ ++#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ ++#define DRM_FORMAT_YVYU fourcc_code('Y', 'V', 'Y', 'U') /* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */ ++#define DRM_FORMAT_UYVY fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ ++#define DRM_FORMAT_VYUY fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */ ++ ++#define DRM_FORMAT_AYUV fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */ ++#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V') /* [31:0] X:Y:Cb:Cr 8:8:8:8 little endian */ ++#define DRM_FORMAT_VUY888 fourcc_code('V', 'U', '2', '4') /* [23:0] Cr:Cb:Y 8:8:8 little endian */ ++#define DRM_FORMAT_VUY101010 fourcc_code('V', 'U', '3', '0') /* Y followed by U then V, 10:10:10. Non-linear modifier only */ ++ ++/* ++ * packed Y2xx indicate for each component, xx valid data occupy msb ++ * 16-xx padding occupy lsb ++ */ ++#define DRM_FORMAT_Y210 fourcc_code('Y', '2', '1', '0') /* [63:0] Cr0:0:Y1:0:Cb0:0:Y0:0 10:6:10:6:10:6:10:6 little endian per 2 Y pixels */ ++#define DRM_FORMAT_Y212 fourcc_code('Y', '2', '1', '2') /* [63:0] Cr0:0:Y1:0:Cb0:0:Y0:0 12:4:12:4:12:4:12:4 little endian per 2 Y pixels */ ++#define DRM_FORMAT_Y216 fourcc_code('Y', '2', '1', '6') /* [63:0] Cr0:Y1:Cb0:Y0 16:16:16:16 little endian per 2 Y pixels */ ++ ++/* ++ * packed Y4xx indicate for each component, xx valid data occupy msb ++ * 16-xx padding occupy lsb except Y410 ++ */ ++#define DRM_FORMAT_Y410 fourcc_code('Y', '4', '1', '0') /* [31:0] A:Cr:Y:Cb 2:10:10:10 little endian */ ++#define DRM_FORMAT_Y412 fourcc_code('Y', '4', '1', '2') /* [63:0] A:0:Cr:0:Y:0:Cb:0 12:4:12:4:12:4:12:4 little endian */ ++#define DRM_FORMAT_Y416 fourcc_code('Y', '4', '1', '6') /* [63:0] A:Cr:Y:Cb 16:16:16:16 little endian */ ++ ++#define DRM_FORMAT_XVYU2101010 fourcc_code('X', 'V', '3', '0') /* [31:0] X:Cr:Y:Cb 2:10:10:10 little endian */ ++#define DRM_FORMAT_XVYU12_16161616 fourcc_code('X', 'V', '3', '6') /* [63:0] X:0:Cr:0:Y:0:Cb:0 12:4:12:4:12:4:12:4 little endian */ ++#define DRM_FORMAT_XVYU16161616 fourcc_code('X', 'V', '4', '8') /* [63:0] X:Cr:Y:Cb 16:16:16:16 little endian */ ++ ++/* ++ * packed YCbCr420 2x2 tiled formats ++ * first 64 bits will contain Y,Cb,Cr components for a 2x2 tile ++ */ ++/* [63:0] A3:A2:Y3:0:Cr0:0:Y2:0:A1:A0:Y1:0:Cb0:0:Y0:0 1:1:8:2:8:2:8:2:1:1:8:2:8:2:8:2 little endian */ ++#define DRM_FORMAT_Y0L0 fourcc_code('Y', '0', 'L', '0') ++/* [63:0] X3:X2:Y3:0:Cr0:0:Y2:0:X1:X0:Y1:0:Cb0:0:Y0:0 1:1:8:2:8:2:8:2:1:1:8:2:8:2:8:2 little endian */ ++#define DRM_FORMAT_X0L0 fourcc_code('X', '0', 'L', '0') ++ ++/* [63:0] A3:A2:Y3:Cr0:Y2:A1:A0:Y1:Cb0:Y0 1:1:10:10:10:1:1:10:10:10 little endian */ ++#define DRM_FORMAT_Y0L2 fourcc_code('Y', '0', 'L', '2') ++/* [63:0] X3:X2:Y3:Cr0:Y2:X1:X0:Y1:Cb0:Y0 1:1:10:10:10:1:1:10:10:10 little endian */ ++#define DRM_FORMAT_X0L2 fourcc_code('X', '0', 'L', '2') ++ ++/* ++ * 1-plane YUV 4:2:0 ++ * In these formats, the component ordering is specified (Y, followed by U ++ * then V), but the exact Linear layout is undefined. ++ * These formats can only be used with a non-Linear modifier. ++ */ ++#define DRM_FORMAT_YUV420_8BIT fourcc_code('Y', 'U', '0', '8') ++#define DRM_FORMAT_YUV420_10BIT fourcc_code('Y', 'U', '1', '0') ++ ++/* ++ * 2 plane RGB + A ++ * index 0 = RGB plane, same format as the corresponding non _A8 format has ++ * index 1 = A plane, [7:0] A ++ */ ++#define DRM_FORMAT_XRGB8888_A8 fourcc_code('X', 'R', 'A', '8') ++#define DRM_FORMAT_XBGR8888_A8 fourcc_code('X', 'B', 'A', '8') ++#define DRM_FORMAT_RGBX8888_A8 fourcc_code('R', 'X', 'A', '8') ++#define DRM_FORMAT_BGRX8888_A8 fourcc_code('B', 'X', 'A', '8') ++#define DRM_FORMAT_RGB888_A8 fourcc_code('R', '8', 'A', '8') ++#define DRM_FORMAT_BGR888_A8 fourcc_code('B', '8', 'A', '8') ++#define DRM_FORMAT_RGB565_A8 fourcc_code('R', '5', 'A', '8') ++#define DRM_FORMAT_BGR565_A8 fourcc_code('B', '5', 'A', '8') ++ ++/* ++ * 2 plane YCbCr ++ * index 0 = Y plane, [7:0] Y ++ * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian ++ * or ++ * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian ++ */ ++#define DRM_FORMAT_NV12 fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */ ++#define DRM_FORMAT_NV21 fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ ++#define DRM_FORMAT_NV16 fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ ++#define DRM_FORMAT_NV61 fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ ++#define DRM_FORMAT_NV24 fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */ ++#define DRM_FORMAT_NV42 fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */ ++/* ++ * 2 plane YCbCr ++ * index 0 = Y plane, [39:0] Y3:Y2:Y1:Y0 little endian ++ * index 1 = Cr:Cb plane, [39:0] Cr1:Cb1:Cr0:Cb0 little endian ++ */ ++#define DRM_FORMAT_NV15 fourcc_code('N', 'V', '1', '5') /* 2x2 subsampled Cr:Cb plane */ ++ ++/* ++ * 2 plane YCbCr MSB aligned ++ * index 0 = Y plane, [15:0] Y:x [10:6] little endian ++ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian ++ */ ++#define DRM_FORMAT_P210 fourcc_code('P', '2', '1', '0') /* 2x1 subsampled Cr:Cb plane, 10 bit per channel */ ++ ++/* ++ * 2 plane YCbCr MSB aligned ++ * index 0 = Y plane, [15:0] Y:x [10:6] little endian ++ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [10:6:10:6] little endian ++ */ ++#define DRM_FORMAT_P010 fourcc_code('P', '0', '1', '0') /* 2x2 subsampled Cr:Cb plane 10 bits per channel */ ++ ++/* ++ * 2 plane YCbCr MSB aligned ++ * index 0 = Y plane, [15:0] Y:x [12:4] little endian ++ * index 1 = Cr:Cb plane, [31:0] Cr:x:Cb:x [12:4:12:4] little endian ++ */ ++#define DRM_FORMAT_P012 fourcc_code('P', '0', '1', '2') /* 2x2 subsampled Cr:Cb plane 12 bits per channel */ ++ ++/* ++ * 2 plane YCbCr MSB aligned ++ * index 0 = Y plane, [15:0] Y little endian ++ * index 1 = Cr:Cb plane, [31:0] Cr:Cb [16:16] little endian ++ */ ++#define DRM_FORMAT_P016 fourcc_code('P', '0', '1', '6') /* 2x2 subsampled Cr:Cb plane 16 bits per channel */ ++ ++/* 3 plane non-subsampled (444) YCbCr ++ * 16 bits per component, but only 10 bits are used and 6 bits are padded ++ * index 0: Y plane, [15:0] Y:x [10:6] little endian ++ * index 1: Cb plane, [15:0] Cb:x [10:6] little endian ++ * index 2: Cr plane, [15:0] Cr:x [10:6] little endian ++ */ ++#define DRM_FORMAT_Q410 fourcc_code('Q', '4', '1', '0') ++ ++/* 3 plane non-subsampled (444) YCrCb ++ * 16 bits per component, but only 10 bits are used and 6 bits are padded ++ * index 0: Y plane, [15:0] Y:x [10:6] little endian ++ * index 1: Cr plane, [15:0] Cr:x [10:6] little endian ++ * index 2: Cb plane, [15:0] Cb:x [10:6] little endian ++ */ ++#define DRM_FORMAT_Q401 fourcc_code('Q', '4', '0', '1') ++ ++/* ++ * 3 plane YCbCr ++ * index 0: Y plane, [7:0] Y ++ * index 1: Cb plane, [7:0] Cb ++ * index 2: Cr plane, [7:0] Cr ++ * or ++ * index 1: Cr plane, [7:0] Cr ++ * index 2: Cb plane, [7:0] Cb ++ */ ++#define DRM_FORMAT_YUV410 fourcc_code('Y', 'U', 'V', '9') /* 4x4 subsampled Cb (1) and Cr (2) planes */ ++#define DRM_FORMAT_YVU410 fourcc_code('Y', 'V', 'U', '9') /* 4x4 subsampled Cr (1) and Cb (2) planes */ ++#define DRM_FORMAT_YUV411 fourcc_code('Y', 'U', '1', '1') /* 4x1 subsampled Cb (1) and Cr (2) planes */ ++#define DRM_FORMAT_YVU411 fourcc_code('Y', 'V', '1', '1') /* 4x1 subsampled Cr (1) and Cb (2) planes */ ++#define DRM_FORMAT_YUV420 fourcc_code('Y', 'U', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes */ ++#define DRM_FORMAT_YVU420 fourcc_code('Y', 'V', '1', '2') /* 2x2 subsampled Cr (1) and Cb (2) planes */ ++#define DRM_FORMAT_YUV422 fourcc_code('Y', 'U', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes */ ++#define DRM_FORMAT_YVU422 fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */ ++#define DRM_FORMAT_YUV444 fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */ ++#define DRM_FORMAT_YVU444 fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */ ++ ++ ++/* ++ * Format Modifiers: ++ * ++ * Format modifiers describe, typically, a re-ordering or modification ++ * of the data in a plane of an FB. This can be used to express tiled/ ++ * swizzled formats, or compression, or a combination of the two. ++ * ++ * The upper 8 bits of the format modifier are a vendor-id as assigned ++ * below. The lower 56 bits are assigned as vendor sees fit. ++ */ ++ ++/* Vendor Ids: */ ++#define DRM_FORMAT_MOD_VENDOR_NONE 0 ++#define DRM_FORMAT_MOD_VENDOR_INTEL 0x01 ++#define DRM_FORMAT_MOD_VENDOR_AMD 0x02 ++#define DRM_FORMAT_MOD_VENDOR_NVIDIA 0x03 ++#define DRM_FORMAT_MOD_VENDOR_SAMSUNG 0x04 ++#define DRM_FORMAT_MOD_VENDOR_QCOM 0x05 ++#define DRM_FORMAT_MOD_VENDOR_VIVANTE 0x06 ++#define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07 ++#define DRM_FORMAT_MOD_VENDOR_ARM 0x08 ++#define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09 ++#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a ++ ++/* add more to the end as needed */ ++ ++#define DRM_FORMAT_RESERVED ((1ULL << 56) - 1) ++ ++#define fourcc_mod_get_vendor(modifier) \ ++ (((modifier) >> 56) & 0xff) ++ ++#define fourcc_mod_is_vendor(modifier, vendor) \ ++ (fourcc_mod_get_vendor(modifier) == DRM_FORMAT_MOD_VENDOR_## vendor) ++ ++#define fourcc_mod_code(vendor, val) \ ++ ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | ((val) & 0x00ffffffffffffffULL)) ++ ++/* ++ * Format Modifier tokens: ++ * ++ * When adding a new token please document the layout with a code comment, ++ * similar to the fourcc codes above. drm_fourcc.h is considered the ++ * authoritative source for all of these. ++ * ++ * Generic modifier names: ++ * ++ * DRM_FORMAT_MOD_GENERIC_* definitions are used to provide vendor-neutral names ++ * for layouts which are common across multiple vendors. To preserve ++ * compatibility, in cases where a vendor-specific definition already exists and ++ * a generic name for it is desired, the common name is a purely symbolic alias ++ * and must use the same numerical value as the original definition. ++ * ++ * Note that generic names should only be used for modifiers which describe ++ * generic layouts (such as pixel re-ordering), which may have ++ * independently-developed support across multiple vendors. ++ * ++ * In future cases where a generic layout is identified before merging with a ++ * vendor-specific modifier, a new 'GENERIC' vendor or modifier using vendor ++ * 'NONE' could be considered. This should only be for obvious, exceptional ++ * cases to avoid polluting the 'GENERIC' namespace with modifiers which only ++ * apply to a single vendor. ++ * ++ * Generic names should not be used for cases where multiple hardware vendors ++ * have implementations of the same standardised compression scheme (such as ++ * AFBC). In those cases, all implementations should use the same format ++ * modifier(s), reflecting the vendor of the standard. ++ */ ++ ++#define DRM_FORMAT_MOD_GENERIC_16_16_TILE DRM_FORMAT_MOD_SAMSUNG_16_16_TILE ++ ++/* ++ * Invalid Modifier ++ * ++ * This modifier can be used as a sentinel to terminate the format modifiers ++ * list, or to initialize a variable with an invalid modifier. It might also be ++ * used to report an error back to userspace for certain APIs. ++ */ ++#define DRM_FORMAT_MOD_INVALID fourcc_mod_code(NONE, DRM_FORMAT_RESERVED) ++ ++/* ++ * Linear Layout ++ * ++ * Just plain linear layout. Note that this is different from no specifying any ++ * modifier (e.g. not setting DRM_MODE_FB_MODIFIERS in the DRM_ADDFB2 ioctl), ++ * which tells the driver to also take driver-internal information into account ++ * and so might actually result in a tiled framebuffer. ++ */ ++#define DRM_FORMAT_MOD_LINEAR fourcc_mod_code(NONE, 0) ++ ++/* ++ * Deprecated: use DRM_FORMAT_MOD_LINEAR instead ++ * ++ * The "none" format modifier doesn't actually mean that the modifier is ++ * implicit, instead it means that the layout is linear. Whether modifiers are ++ * used is out-of-band information carried in an API-specific way (e.g. in a ++ * flag for drm_mode_fb_cmd2). ++ */ ++#define DRM_FORMAT_MOD_NONE 0 ++ ++/* Intel framebuffer modifiers */ ++ ++/* ++ * Intel X-tiling layout ++ * ++ * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb) ++ * in row-major layout. Within the tile bytes are laid out row-major, with ++ * a platform-dependent stride. On top of that the memory can apply ++ * platform-depending swizzling of some higher address bits into bit6. ++ * ++ * Note that this layout is only accurate on intel gen 8+ or valleyview chipsets. ++ * On earlier platforms the is highly platforms specific and not useful for ++ * cross-driver sharing. It exists since on a given platform it does uniquely ++ * identify the layout in a simple way for i915-specific userspace, which ++ * facilitated conversion of userspace to modifiers. Additionally the exact ++ * format on some really old platforms is not known. ++ */ ++#define I915_FORMAT_MOD_X_TILED fourcc_mod_code(INTEL, 1) ++ ++/* ++ * Intel Y-tiling layout ++ * ++ * This is a tiled layout using 4Kb tiles (except on gen2 where the tiles 2Kb) ++ * in row-major layout. Within the tile bytes are laid out in OWORD (16 bytes) ++ * chunks column-major, with a platform-dependent height. On top of that the ++ * memory can apply platform-depending swizzling of some higher address bits ++ * into bit6. ++ * ++ * Note that this layout is only accurate on intel gen 8+ or valleyview chipsets. ++ * On earlier platforms the is highly platforms specific and not useful for ++ * cross-driver sharing. It exists since on a given platform it does uniquely ++ * identify the layout in a simple way for i915-specific userspace, which ++ * facilitated conversion of userspace to modifiers. Additionally the exact ++ * format on some really old platforms is not known. ++ */ ++#define I915_FORMAT_MOD_Y_TILED fourcc_mod_code(INTEL, 2) ++ ++/* ++ * Intel Yf-tiling layout ++ * ++ * This is a tiled layout using 4Kb tiles in row-major layout. ++ * Within the tile pixels are laid out in 16 256 byte units / sub-tiles which ++ * are arranged in four groups (two wide, two high) with column-major layout. ++ * Each group therefore consits out of four 256 byte units, which are also laid ++ * out as 2x2 column-major. ++ * 256 byte units are made out of four 64 byte blocks of pixels, producing ++ * either a square block or a 2:1 unit. ++ * 64 byte blocks of pixels contain four pixel rows of 16 bytes, where the width ++ * in pixel depends on the pixel depth. ++ */ ++#define I915_FORMAT_MOD_Yf_TILED fourcc_mod_code(INTEL, 3) ++ ++/* ++ * Intel color control surface (CCS) for render compression ++ * ++ * The framebuffer format must be one of the 8:8:8:8 RGB formats. ++ * The main surface will be plane index 0 and must be Y/Yf-tiled, ++ * the CCS will be plane index 1. ++ * ++ * Each CCS tile matches a 1024x512 pixel area of the main surface. ++ * To match certain aspects of the 3D hardware the CCS is ++ * considered to be made up of normal 128Bx32 Y tiles, Thus ++ * the CCS pitch must be specified in multiples of 128 bytes. ++ * ++ * In reality the CCS tile appears to be a 64Bx64 Y tile, composed ++ * of QWORD (8 bytes) chunks instead of OWORD (16 bytes) chunks. ++ * But that fact is not relevant unless the memory is accessed ++ * directly. ++ */ ++#define I915_FORMAT_MOD_Y_TILED_CCS fourcc_mod_code(INTEL, 4) ++#define I915_FORMAT_MOD_Yf_TILED_CCS fourcc_mod_code(INTEL, 5) ++ ++/* ++ * Intel color control surfaces (CCS) for Gen-12 render compression. ++ * ++ * The main surface is Y-tiled and at plane index 0, the CCS is linear and ++ * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in ++ * main surface. In other words, 4 bits in CCS map to a main surface cache ++ * line pair. The main surface pitch is required to be a multiple of four ++ * Y-tile widths. ++ */ ++#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS fourcc_mod_code(INTEL, 6) ++ ++/* ++ * Intel color control surfaces (CCS) for Gen-12 media compression ++ * ++ * The main surface is Y-tiled and at plane index 0, the CCS is linear and ++ * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in ++ * main surface. In other words, 4 bits in CCS map to a main surface cache ++ * line pair. The main surface pitch is required to be a multiple of four ++ * Y-tile widths. For semi-planar formats like NV12, CCS planes follow the ++ * Y and UV planes i.e., planes 0 and 1 are used for Y and UV surfaces, ++ * planes 2 and 3 for the respective CCS. ++ */ ++#define I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS fourcc_mod_code(INTEL, 7) ++ ++/* ++ * Intel Color Control Surface with Clear Color (CCS) for Gen-12 render ++ * compression. ++ * ++ * The main surface is Y-tiled and is at plane index 0 whereas CCS is linear ++ * and at index 1. The clear color is stored at index 2, and the pitch should ++ * be ignored. The clear color structure is 256 bits. The first 128 bits ++ * represents Raw Clear Color Red, Green, Blue and Alpha color each represented ++ * by 32 bits. The raw clear color is consumed by the 3d engine and generates ++ * the converted clear color of size 64 bits. The first 32 bits store the Lower ++ * Converted Clear Color value and the next 32 bits store the Higher Converted ++ * Clear Color value when applicable. The Converted Clear Color values are ++ * consumed by the DE. The last 64 bits are used to store Color Discard Enable ++ * and Depth Clear Value Valid which are ignored by the DE. A CCS cache line ++ * corresponds to an area of 4x1 tiles in the main surface. The main surface ++ * pitch is required to be a multiple of 4 tile widths. ++ */ ++#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8) ++ ++/* ++ * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks ++ * ++ * Macroblocks are laid in a Z-shape, and each pixel data is following the ++ * standard NV12 style. ++ * As for NV12, an image is the result of two frame buffers: one for Y, ++ * one for the interleaved Cb/Cr components (1/2 the height of the Y buffer). ++ * Alignment requirements are (for each buffer): ++ * - multiple of 128 pixels for the width ++ * - multiple of 32 pixels for the height ++ * ++ * For more information: see https://linuxtv.org/downloads/v4l-dvb-apis/re32.html ++ */ ++#define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE fourcc_mod_code(SAMSUNG, 1) ++ ++/* ++ * Tiled, 16 (pixels) x 16 (lines) - sized macroblocks ++ * ++ * This is a simple tiled layout using tiles of 16x16 pixels in a row-major ++ * layout. For YCbCr formats Cb/Cr components are taken in such a way that ++ * they correspond to their 16x16 luma block. ++ */ ++#define DRM_FORMAT_MOD_SAMSUNG_16_16_TILE fourcc_mod_code(SAMSUNG, 2) ++ ++/* ++ * Qualcomm Compressed Format ++ * ++ * Refers to a compressed variant of the base format that is compressed. ++ * Implementation may be platform and base-format specific. ++ * ++ * Each macrotile consists of m x n (mostly 4 x 4) tiles. ++ * Pixel data pitch/stride is aligned with macrotile width. ++ * Pixel data height is aligned with macrotile height. ++ * Entire pixel data buffer is aligned with 4k(bytes). ++ */ ++#define DRM_FORMAT_MOD_QCOM_COMPRESSED fourcc_mod_code(QCOM, 1) ++ ++/* Vivante framebuffer modifiers */ ++ ++/* ++ * Vivante 4x4 tiling layout ++ * ++ * This is a simple tiled layout using tiles of 4x4 pixels in a row-major ++ * layout. ++ */ ++#define DRM_FORMAT_MOD_VIVANTE_TILED fourcc_mod_code(VIVANTE, 1) ++ ++/* ++ * Vivante 64x64 super-tiling layout ++ * ++ * This is a tiled layout using 64x64 pixel super-tiles, where each super-tile ++ * contains 8x4 groups of 2x4 tiles of 4x4 pixels (like above) each, all in row- ++ * major layout. ++ * ++ * For more information: see ++ * https://github.com/etnaviv/etna_viv/blob/master/doc/hardware.md#texture-tiling ++ */ ++#define DRM_FORMAT_MOD_VIVANTE_SUPER_TILED fourcc_mod_code(VIVANTE, 2) ++ ++/* ++ * Vivante 4x4 tiling layout for dual-pipe ++ * ++ * Same as the 4x4 tiling layout, except every second 4x4 pixel tile starts at a ++ * different base address. Offsets from the base addresses are therefore halved ++ * compared to the non-split tiled layout. ++ */ ++#define DRM_FORMAT_MOD_VIVANTE_SPLIT_TILED fourcc_mod_code(VIVANTE, 3) ++ ++/* ++ * Vivante 64x64 super-tiling layout for dual-pipe ++ * ++ * Same as the 64x64 super-tiling layout, except every second 4x4 pixel tile ++ * starts at a different base address. Offsets from the base addresses are ++ * therefore halved compared to the non-split super-tiled layout. ++ */ ++#define DRM_FORMAT_MOD_VIVANTE_SPLIT_SUPER_TILED fourcc_mod_code(VIVANTE, 4) ++ ++/* NVIDIA frame buffer modifiers */ ++ ++/* ++ * Tegra Tiled Layout, used by Tegra 2, 3 and 4. ++ * ++ * Pixels are arranged in simple tiles of 16 x 16 bytes. ++ */ ++#define DRM_FORMAT_MOD_NVIDIA_TEGRA_TILED fourcc_mod_code(NVIDIA, 1) ++ ++/* ++ * Generalized Block Linear layout, used by desktop GPUs starting with NV50/G80, ++ * and Tegra GPUs starting with Tegra K1. ++ * ++ * Pixels are arranged in Groups of Bytes (GOBs). GOB size and layout varies ++ * based on the architecture generation. GOBs themselves are then arranged in ++ * 3D blocks, with the block dimensions (in terms of GOBs) always being a power ++ * of two, and hence expressible as their log2 equivalent (E.g., "2" represents ++ * a block depth or height of "4"). ++ * ++ * Chapter 20 "Pixel Memory Formats" of the Tegra X1 TRM describes this format ++ * in full detail. ++ * ++ * Macro ++ * Bits Param Description ++ * ---- ----- ----------------------------------------------------------------- ++ * ++ * 3:0 h log2(height) of each block, in GOBs. Placed here for ++ * compatibility with the existing ++ * DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK()-based modifiers. ++ * ++ * 4:4 - Must be 1, to indicate block-linear layout. Necessary for ++ * compatibility with the existing ++ * DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK()-based modifiers. ++ * ++ * 8:5 - Reserved (To support 3D-surfaces with variable log2(depth) block ++ * size). Must be zero. ++ * ++ * Note there is no log2(width) parameter. Some portions of the ++ * hardware support a block width of two gobs, but it is impractical ++ * to use due to lack of support elsewhere, and has no known ++ * benefits. ++ * ++ * 11:9 - Reserved (To support 2D-array textures with variable array stride ++ * in blocks, specified via log2(tile width in blocks)). Must be ++ * zero. ++ * ++ * 19:12 k Page Kind. This value directly maps to a field in the page ++ * tables of all GPUs >= NV50. It affects the exact layout of bits ++ * in memory and can be derived from the tuple ++ * ++ * (format, GPU model, compression type, samples per pixel) ++ * ++ * Where compression type is defined below. If GPU model were ++ * implied by the format modifier, format, or memory buffer, page ++ * kind would not need to be included in the modifier itself, but ++ * since the modifier should define the layout of the associated ++ * memory buffer independent from any device or other context, it ++ * must be included here. ++ * ++ * 21:20 g GOB Height and Page Kind Generation. The height of a GOB changed ++ * starting with Fermi GPUs. Additionally, the mapping between page ++ * kind and bit layout has changed at various points. ++ * ++ * 0 = Gob Height 8, Fermi - Volta, Tegra K1+ Page Kind mapping ++ * 1 = Gob Height 4, G80 - GT2XX Page Kind mapping ++ * 2 = Gob Height 8, Turing+ Page Kind mapping ++ * 3 = Reserved for future use. ++ * ++ * 22:22 s Sector layout. On Tegra GPUs prior to Xavier, there is a further ++ * bit remapping step that occurs at an even lower level than the ++ * page kind and block linear swizzles. This causes the layout of ++ * surfaces mapped in those SOC's GPUs to be incompatible with the ++ * equivalent mapping on other GPUs in the same system. ++ * ++ * 0 = Tegra K1 - Tegra Parker/TX2 Layout. ++ * 1 = Desktop GPU and Tegra Xavier+ Layout ++ * ++ * 25:23 c Lossless Framebuffer Compression type. ++ * ++ * 0 = none ++ * 1 = ROP/3D, layout 1, exact compression format implied by Page ++ * Kind field ++ * 2 = ROP/3D, layout 2, exact compression format implied by Page ++ * Kind field ++ * 3 = CDE horizontal ++ * 4 = CDE vertical ++ * 5 = Reserved for future use ++ * 6 = Reserved for future use ++ * 7 = Reserved for future use ++ * ++ * 55:25 - Reserved for future use. Must be zero. ++ */ ++#define DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D(c, s, g, k, h) \ ++ fourcc_mod_code(NVIDIA, (0x10 | \ ++ ((h) & 0xf) | \ ++ (((k) & 0xff) << 12) | \ ++ (((g) & 0x3) << 20) | \ ++ (((s) & 0x1) << 22) | \ ++ (((c) & 0x7) << 23))) ++ ++/* To grandfather in prior block linear format modifiers to the above layout, ++ * the page kind "0", which corresponds to "pitch/linear" and hence is unusable ++ * with block-linear layouts, is remapped within drivers to the value 0xfe, ++ * which corresponds to the "generic" kind used for simple single-sample ++ * uncompressed color formats on Fermi - Volta GPUs. ++ */ ++static __inline__ __u64 ++drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) ++{ ++ if (!(modifier & 0x10) || (modifier & (0xff << 12))) ++ return modifier; ++ else ++ return modifier | (0xfe << 12); ++} ++ ++/* ++ * 16Bx2 Block Linear layout, used by Tegra K1 and later ++ * ++ * Pixels are arranged in 64x8 Groups Of Bytes (GOBs). GOBs are then stacked ++ * vertically by a power of 2 (1 to 32 GOBs) to form a block. ++ * ++ * Within a GOB, data is ordered as 16B x 2 lines sectors laid in Z-shape. ++ * ++ * Parameter 'v' is the log2 encoding of the number of GOBs stacked vertically. ++ * Valid values are: ++ * ++ * 0 == ONE_GOB ++ * 1 == TWO_GOBS ++ * 2 == FOUR_GOBS ++ * 3 == EIGHT_GOBS ++ * 4 == SIXTEEN_GOBS ++ * 5 == THIRTYTWO_GOBS ++ * ++ * Chapter 20 "Pixel Memory Formats" of the Tegra X1 TRM describes this format ++ * in full detail. ++ */ ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(v) \ ++ DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEAR_2D(0, 0, 0, 0, (v)) ++ ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_ONE_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(0) ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_TWO_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(1) ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_FOUR_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(2) ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_EIGHT_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(3) ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_SIXTEEN_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(4) ++#define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_THIRTYTWO_GOB \ ++ DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(5) ++ ++/* ++ * Some Broadcom modifiers take parameters, for example the number of ++ * vertical lines in the image. Reserve the lower 32 bits for modifier ++ * type, and the next 24 bits for parameters. Top 8 bits are the ++ * vendor code. ++ */ ++#define __fourcc_mod_broadcom_param_shift 8 ++#define __fourcc_mod_broadcom_param_bits 48 ++#define fourcc_mod_broadcom_code(val, params) \ ++ fourcc_mod_code(BROADCOM, ((((__u64)params) << __fourcc_mod_broadcom_param_shift) | val)) ++#define fourcc_mod_broadcom_param(m) \ ++ ((int)(((m) >> __fourcc_mod_broadcom_param_shift) & \ ++ ((1ULL << __fourcc_mod_broadcom_param_bits) - 1))) ++#define fourcc_mod_broadcom_mod(m) \ ++ ((m) & ~(((1ULL << __fourcc_mod_broadcom_param_bits) - 1) << \ ++ __fourcc_mod_broadcom_param_shift)) ++ ++/* ++ * Broadcom VC4 "T" format ++ * ++ * This is the primary layout that the V3D GPU can texture from (it ++ * can't do linear). The T format has: ++ * ++ * - 64b utiles of pixels in a raster-order grid according to cpp. It's 4x4 ++ * pixels at 32 bit depth. ++ * ++ * - 1k subtiles made of a 4x4 raster-order grid of 64b utiles (so usually ++ * 16x16 pixels). ++ * ++ * - 4k tiles made of a 2x2 grid of 1k subtiles (so usually 32x32 pixels). On ++ * even 4k tile rows, they're arranged as (BL, TL, TR, BR), and on odd rows ++ * they're (TR, BR, BL, TL), where bottom left is start of memory. ++ * ++ * - an image made of 4k tiles in rows either left-to-right (even rows of 4k ++ * tiles) or right-to-left (odd rows of 4k tiles). ++ */ ++#define DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED fourcc_mod_code(BROADCOM, 1) ++ ++/* ++ * Broadcom SAND format ++ * ++ * This is the native format that the H.264 codec block uses. For VC4 ++ * HVS, it is only valid for H.264 (NV12/21) and RGBA modes. ++ * ++ * The image can be considered to be split into columns, and the ++ * columns are placed consecutively into memory. The width of those ++ * columns can be either 32, 64, 128, or 256 pixels, but in practice ++ * only 128 pixel columns are used. ++ * ++ * The pitch between the start of each column is set to optimally ++ * switch between SDRAM banks. This is passed as the number of lines ++ * of column width in the modifier (we can't use the stride value due ++ * to various core checks that look at it , so you should set the ++ * stride to width*cpp). ++ * ++ * Note that the column height for this format modifier is the same ++ * for all of the planes, assuming that each column contains both Y ++ * and UV. Some SAND-using hardware stores UV in a separate tiled ++ * image from Y to reduce the column height, which is not supported ++ * with these modifiers. ++ */ ++ ++#define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \ ++ fourcc_mod_broadcom_code(2, v) ++#define DRM_FORMAT_MOD_BROADCOM_SAND64_COL_HEIGHT(v) \ ++ fourcc_mod_broadcom_code(3, v) ++#define DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT(v) \ ++ fourcc_mod_broadcom_code(4, v) ++#define DRM_FORMAT_MOD_BROADCOM_SAND256_COL_HEIGHT(v) \ ++ fourcc_mod_broadcom_code(5, v) ++ ++#define DRM_FORMAT_MOD_BROADCOM_SAND32 \ ++ DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(0) ++#define DRM_FORMAT_MOD_BROADCOM_SAND64 \ ++ DRM_FORMAT_MOD_BROADCOM_SAND64_COL_HEIGHT(0) ++#define DRM_FORMAT_MOD_BROADCOM_SAND128 \ ++ DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT(0) ++#define DRM_FORMAT_MOD_BROADCOM_SAND256 \ ++ DRM_FORMAT_MOD_BROADCOM_SAND256_COL_HEIGHT(0) ++ ++/* Broadcom UIF format ++ * ++ * This is the common format for the current Broadcom multimedia ++ * blocks, including V3D 3.x and newer, newer video codecs, and ++ * displays. ++ * ++ * The image consists of utiles (64b blocks), UIF blocks (2x2 utiles), ++ * and macroblocks (4x4 UIF blocks). Those 4x4 UIF block groups are ++ * stored in columns, with padding between the columns to ensure that ++ * moving from one column to the next doesn't hit the same SDRAM page ++ * bank. ++ * ++ * To calculate the padding, it is assumed that each hardware block ++ * and the software driving it knows the platform's SDRAM page size, ++ * number of banks, and XOR address, and that it's identical between ++ * all blocks using the format. This tiling modifier will use XOR as ++ * necessary to reduce the padding. If a hardware block can't do XOR, ++ * the assumption is that a no-XOR tiling modifier will be created. ++ */ ++#define DRM_FORMAT_MOD_BROADCOM_UIF fourcc_mod_code(BROADCOM, 6) ++ ++/* ++ * Arm Framebuffer Compression (AFBC) modifiers ++ * ++ * AFBC is a proprietary lossless image compression protocol and format. ++ * It provides fine-grained random access and minimizes the amount of data ++ * transferred between IP blocks. ++ * ++ * AFBC has several features which may be supported and/or used, which are ++ * represented using bits in the modifier. Not all combinations are valid, ++ * and different devices or use-cases may support different combinations. ++ * ++ * Further information on the use of AFBC modifiers can be found in ++ * Documentation/gpu/afbc.rst ++ */ ++ ++/* ++ * The top 4 bits (out of the 56 bits alloted for specifying vendor specific ++ * modifiers) denote the category for modifiers. Currently we have three ++ * categories of modifiers ie AFBC, MISC and AFRC. We can have a maximum of ++ * sixteen different categories. ++ */ ++#define DRM_FORMAT_MOD_ARM_CODE(__type, __val) \ ++ fourcc_mod_code(ARM, ((__u64)(__type) << 52) | ((__val) & 0x000fffffffffffffULL)) ++ ++#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 ++#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 ++ ++#define DRM_FORMAT_MOD_ARM_AFBC(__afbc_mode) \ ++ DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode) ++ ++/* ++ * AFBC superblock size ++ * ++ * Indicates the superblock size(s) used for the AFBC buffer. The buffer ++ * size (in pixels) must be aligned to a multiple of the superblock size. ++ * Four lowest significant bits(LSBs) are reserved for block size. ++ * ++ * Where one superblock size is specified, it applies to all planes of the ++ * buffer (e.g. 16x16, 32x8). When multiple superblock sizes are specified, ++ * the first applies to the Luma plane and the second applies to the Chroma ++ * plane(s). e.g. (32x8_64x4 means 32x8 Luma, with 64x4 Chroma). ++ * Multiple superblock sizes are only valid for multi-plane YCbCr formats. ++ */ ++#define AFBC_FORMAT_MOD_BLOCK_SIZE_MASK 0xf ++#define AFBC_FORMAT_MOD_BLOCK_SIZE_16x16 (1ULL) ++#define AFBC_FORMAT_MOD_BLOCK_SIZE_32x8 (2ULL) ++#define AFBC_FORMAT_MOD_BLOCK_SIZE_64x4 (3ULL) ++#define AFBC_FORMAT_MOD_BLOCK_SIZE_32x8_64x4 (4ULL) ++ ++/* ++ * AFBC lossless colorspace transform ++ * ++ * Indicates that the buffer makes use of the AFBC lossless colorspace ++ * transform. ++ */ ++#define AFBC_FORMAT_MOD_YTR (1ULL << 4) ++ ++/* ++ * AFBC block-split ++ * ++ * Indicates that the payload of each superblock is split. The second ++ * half of the payload is positioned at a predefined offset from the start ++ * of the superblock payload. ++ */ ++#define AFBC_FORMAT_MOD_SPLIT (1ULL << 5) ++ ++/* ++ * AFBC sparse layout ++ * ++ * This flag indicates that the payload of each superblock must be stored at a ++ * predefined position relative to the other superblocks in the same AFBC ++ * buffer. This order is the same order used by the header buffer. In this mode ++ * each superblock is given the same amount of space as an uncompressed ++ * superblock of the particular format would require, rounding up to the next ++ * multiple of 128 bytes in size. ++ */ ++#define AFBC_FORMAT_MOD_SPARSE (1ULL << 6) ++ ++/* ++ * AFBC copy-block restrict ++ * ++ * Buffers with this flag must obey the copy-block restriction. The restriction ++ * is such that there are no copy-blocks referring across the border of 8x8 ++ * blocks. For the subsampled data the 8x8 limitation is also subsampled. ++ */ ++#define AFBC_FORMAT_MOD_CBR (1ULL << 7) ++ ++/* ++ * AFBC tiled layout ++ * ++ * The tiled layout groups superblocks in 8x8 or 4x4 tiles, where all ++ * superblocks inside a tile are stored together in memory. 8x8 tiles are used ++ * for pixel formats up to and including 32 bpp while 4x4 tiles are used for ++ * larger bpp formats. The order between the tiles is scan line. ++ * When the tiled layout is used, the buffer size (in pixels) must be aligned ++ * to the tile size. ++ */ ++#define AFBC_FORMAT_MOD_TILED (1ULL << 8) ++ ++/* ++ * AFBC solid color blocks ++ * ++ * Indicates that the buffer makes use of solid-color blocks, whereby bandwidth ++ * can be reduced if a whole superblock is a single color. ++ */ ++#define AFBC_FORMAT_MOD_SC (1ULL << 9) ++ ++/* ++ * AFBC double-buffer ++ * ++ * Indicates that the buffer is allocated in a layout safe for front-buffer ++ * rendering. ++ */ ++#define AFBC_FORMAT_MOD_DB (1ULL << 10) ++ ++/* ++ * AFBC buffer content hints ++ * ++ * Indicates that the buffer includes per-superblock content hints. ++ */ ++#define AFBC_FORMAT_MOD_BCH (1ULL << 11) ++ ++/* AFBC uncompressed storage mode ++ * ++ * Indicates that the buffer is using AFBC uncompressed storage mode. ++ * In this mode all superblock payloads in the buffer use the uncompressed ++ * storage mode, which is usually only used for data which cannot be compressed. ++ * The buffer layout is the same as for AFBC buffers without USM set, this only ++ * affects the storage mode of the individual superblocks. Note that even a ++ * buffer without USM set may use uncompressed storage mode for some or all ++ * superblocks, USM just guarantees it for all. ++ */ ++#define AFBC_FORMAT_MOD_USM (1ULL << 12) ++ ++/* ++ * Arm Fixed-Rate Compression (AFRC) modifiers ++ * ++ * AFRC is a proprietary fixed rate image compression protocol and format, ++ * designed to provide guaranteed bandwidth and memory footprint ++ * reductions in graphics and media use-cases. ++ * ++ * AFRC buffers consist of one or more planes, with the same components ++ * and meaning as an uncompressed buffer using the same pixel format. ++ * ++ * Within each plane, the pixel/luma/chroma values are grouped into ++ * "coding unit" blocks which are individually compressed to a ++ * fixed size (in bytes). All coding units within a given plane of a buffer ++ * store the same number of values, and have the same compressed size. ++ * ++ * The coding unit size is configurable, allowing different rates of compression. ++ * ++ * The start of each AFRC buffer plane must be aligned to an alignment granule which ++ * depends on the coding unit size. ++ * ++ * Coding Unit Size Plane Alignment ++ * ---------------- --------------- ++ * 16 bytes 1024 bytes ++ * 24 bytes 512 bytes ++ * 32 bytes 2048 bytes ++ * ++ * Coding units are grouped into paging tiles. AFRC buffer dimensions must be aligned ++ * to a multiple of the paging tile dimensions. ++ * The dimensions of each paging tile depend on whether the buffer is optimised for ++ * scanline (SCAN layout) or rotated (ROT layout) access. ++ * ++ * Layout Paging Tile Width Paging Tile Height ++ * ------ ----------------- ------------------ ++ * SCAN 16 coding units 4 coding units ++ * ROT 8 coding units 8 coding units ++ * ++ * The dimensions of each coding unit depend on the number of components ++ * in the compressed plane and whether the buffer is optimised for ++ * scanline (SCAN layout) or rotated (ROT layout) access. ++ * ++ * Number of Components in Plane Layout Coding Unit Width Coding Unit Height ++ * ----------------------------- --------- ----------------- ------------------ ++ * 1 SCAN 16 samples 4 samples ++ * Example: 16x4 luma samples in a 'Y' plane ++ * 16x4 chroma 'V' values, in the 'V' plane of a fully-planar YUV buffer ++ * ----------------------------- --------- ----------------- ------------------ ++ * 1 ROT 8 samples 8 samples ++ * Example: 8x8 luma samples in a 'Y' plane ++ * 8x8 chroma 'V' values, in the 'V' plane of a fully-planar YUV buffer ++ * ----------------------------- --------- ----------------- ------------------ ++ * 2 DONT CARE 8 samples 4 samples ++ * Example: 8x4 chroma pairs in the 'UV' plane of a semi-planar YUV buffer ++ * ----------------------------- --------- ----------------- ------------------ ++ * 3 DONT CARE 4 samples 4 samples ++ * Example: 4x4 pixels in an RGB buffer without alpha ++ * ----------------------------- --------- ----------------- ------------------ ++ * 4 DONT CARE 4 samples 4 samples ++ * Example: 4x4 pixels in an RGB buffer with alpha ++ */ ++ ++#define DRM_FORMAT_MOD_ARM_TYPE_AFRC 0x02 ++ ++#define DRM_FORMAT_MOD_ARM_AFRC(__afrc_mode) \ ++ DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFRC, __afrc_mode) ++ ++/* ++ * AFRC coding unit size modifier. ++ * ++ * Indicates the number of bytes used to store each compressed coding unit for ++ * one or more planes in an AFRC encoded buffer. The coding unit size for chrominance ++ * is the same for both Cb and Cr, which may be stored in separate planes. ++ * ++ * AFRC_FORMAT_MOD_CU_SIZE_P0 indicates the number of bytes used to store ++ * each compressed coding unit in the first plane of the buffer. For RGBA buffers ++ * this is the only plane, while for semi-planar and fully-planar YUV buffers, ++ * this corresponds to the luma plane. ++ * ++ * AFRC_FORMAT_MOD_CU_SIZE_P12 indicates the number of bytes used to store ++ * each compressed coding unit in the second and third planes in the buffer. ++ * For semi-planar and fully-planar YUV buffers, this corresponds to the chroma plane(s). ++ * ++ * For single-plane buffers, AFRC_FORMAT_MOD_CU_SIZE_P0 must be specified ++ * and AFRC_FORMAT_MOD_CU_SIZE_P12 must be zero. ++ * For semi-planar and fully-planar buffers, both AFRC_FORMAT_MOD_CU_SIZE_P0 and ++ * AFRC_FORMAT_MOD_CU_SIZE_P12 must be specified. ++ */ ++#define AFRC_FORMAT_MOD_CU_SIZE_MASK 0xf ++#define AFRC_FORMAT_MOD_CU_SIZE_16 (1ULL) ++#define AFRC_FORMAT_MOD_CU_SIZE_24 (2ULL) ++#define AFRC_FORMAT_MOD_CU_SIZE_32 (3ULL) ++ ++#define AFRC_FORMAT_MOD_CU_SIZE_P0(__afrc_cu_size) (__afrc_cu_size) ++#define AFRC_FORMAT_MOD_CU_SIZE_P12(__afrc_cu_size) ((__afrc_cu_size) << 4) ++ ++/* ++ * AFRC scanline memory layout. ++ * ++ * Indicates if the buffer uses the scanline-optimised layout ++ * for an AFRC encoded buffer, otherwise, it uses the rotation-optimised layout. ++ * The memory layout is the same for all planes. ++ */ ++#define AFRC_FORMAT_MOD_LAYOUT_SCAN (1ULL << 8) ++ ++/* ++ * Arm 16x16 Block U-Interleaved modifier ++ * ++ * This is used by Arm Mali Utgard and Midgard GPUs. It divides the image ++ * into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels ++ * in the block are reordered. ++ */ ++#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ ++ DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) ++ ++/* ++ * Allwinner tiled modifier ++ * ++ * This tiling mode is implemented by the VPU found on all Allwinner platforms, ++ * codenamed sunxi. It is associated with a YUV format that uses either 2 or 3 ++ * planes. ++ * ++ * With this tiling, the luminance samples are disposed in tiles representing ++ * 32x32 pixels and the chrominance samples in tiles representing 32x64 pixels. ++ * The pixel order in each tile is linear and the tiles are disposed linearly, ++ * both in row-major order. ++ */ ++#define DRM_FORMAT_MOD_ALLWINNER_TILED fourcc_mod_code(ALLWINNER, 1) ++ ++/* ++ * Amlogic Video Framebuffer Compression modifiers ++ * ++ * Amlogic uses a proprietary lossless image compression protocol and format ++ * for their hardware video codec accelerators, either video decoders or ++ * video input encoders. ++ * ++ * It considerably reduces memory bandwidth while writing and reading ++ * frames in memory. ++ * ++ * The underlying storage is considered to be 3 components, 8bit or 10-bit ++ * per component YCbCr 420, single plane : ++ * - DRM_FORMAT_YUV420_8BIT ++ * - DRM_FORMAT_YUV420_10BIT ++ * ++ * The first 8 bits of the mode defines the layout, then the following 8 bits ++ * defines the options changing the layout. ++ * ++ * Not all combinations are valid, and different SoCs may support different ++ * combinations of layout and options. ++ */ ++#define __fourcc_mod_amlogic_layout_mask 0xff ++#define __fourcc_mod_amlogic_options_shift 8 ++#define __fourcc_mod_amlogic_options_mask 0xff ++ ++#define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \ ++ fourcc_mod_code(AMLOGIC, \ ++ ((__layout) & __fourcc_mod_amlogic_layout_mask) | \ ++ (((__options) & __fourcc_mod_amlogic_options_mask) \ ++ << __fourcc_mod_amlogic_options_shift)) ++ ++/* Amlogic FBC Layouts */ ++ ++/* ++ * Amlogic FBC Basic Layout ++ * ++ * The basic layout is composed of: ++ * - a body content organized in 64x32 superblocks with 4096 bytes per ++ * superblock in default mode. ++ * - a 32 bytes per 128x64 header block ++ * ++ * This layout is transferrable between Amlogic SoCs supporting this modifier. ++ */ ++#define AMLOGIC_FBC_LAYOUT_BASIC (1ULL) ++ ++/* ++ * Amlogic FBC Scatter Memory layout ++ * ++ * Indicates the header contains IOMMU references to the compressed ++ * frames content to optimize memory access and layout. ++ * ++ * In this mode, only the header memory address is needed, thus the ++ * content memory organization is tied to the current producer ++ * execution and cannot be saved/dumped neither transferrable between ++ * Amlogic SoCs supporting this modifier. ++ * ++ * Due to the nature of the layout, these buffers are not expected to ++ * be accessible by the user-space clients, but only accessible by the ++ * hardware producers and consumers. ++ * ++ * The user-space clients should expect a failure while trying to mmap ++ * the DMA-BUF handle returned by the producer. ++ */ ++#define AMLOGIC_FBC_LAYOUT_SCATTER (2ULL) ++ ++/* Amlogic FBC Layout Options Bit Mask */ ++ ++/* ++ * Amlogic FBC Memory Saving mode ++ * ++ * Indicates the storage is packed when pixel size is multiple of word ++ * boudaries, i.e. 8bit should be stored in this mode to save allocation ++ * memory. ++ * ++ * This mode reduces body layout to 3072 bytes per 64x32 superblock with ++ * the basic layout and 3200 bytes per 64x32 superblock combined with ++ * the scatter layout. ++ */ ++#define AMLOGIC_FBC_OPTION_MEM_SAVING (1ULL << 0) ++ ++/* ++ * AMD modifiers ++ * ++ * Memory layout: ++ * ++ * without DCC: ++ * - main surface ++ * ++ * with DCC & without DCC_RETILE: ++ * - main surface in plane 0 ++ * - DCC surface in plane 1 (RB-aligned, pipe-aligned if DCC_PIPE_ALIGN is set) ++ * ++ * with DCC & DCC_RETILE: ++ * - main surface in plane 0 ++ * - displayable DCC surface in plane 1 (not RB-aligned & not pipe-aligned) ++ * - pipe-aligned DCC surface in plane 2 (RB-aligned & pipe-aligned) ++ * ++ * For multi-plane formats the above surfaces get merged into one plane for ++ * each format plane, based on the required alignment only. ++ * ++ * Bits Parameter Notes ++ * ----- ------------------------ --------------------------------------------- ++ * ++ * 7:0 TILE_VERSION Values are AMD_FMT_MOD_TILE_VER_* ++ * 12:8 TILE Values are AMD_FMT_MOD_TILE__* ++ * 13 DCC ++ * 14 DCC_RETILE ++ * 15 DCC_PIPE_ALIGN ++ * 16 DCC_INDEPENDENT_64B ++ * 17 DCC_INDEPENDENT_128B ++ * 19:18 DCC_MAX_COMPRESSED_BLOCK Values are AMD_FMT_MOD_DCC_BLOCK_* ++ * 20 DCC_CONSTANT_ENCODE ++ * 23:21 PIPE_XOR_BITS Only for some chips ++ * 26:24 BANK_XOR_BITS Only for some chips ++ * 29:27 PACKERS Only for some chips ++ * 32:30 RB Only for some chips ++ * 35:33 PIPE Only for some chips ++ * 55:36 - Reserved for future use, must be zero ++ */ ++#define AMD_FMT_MOD fourcc_mod_code(AMD, 0) ++ ++#define IS_AMD_FMT_MOD(val) (((val) >> 56) == DRM_FORMAT_MOD_VENDOR_AMD) ++ ++/* Reserve 0 for GFX8 and older */ ++#define AMD_FMT_MOD_TILE_VER_GFX9 1 ++#define AMD_FMT_MOD_TILE_VER_GFX10 2 ++#define AMD_FMT_MOD_TILE_VER_GFX10_RBPLUS 3 ++ ++/* ++ * 64K_S is the same for GFX9/GFX10/GFX10_RBPLUS and hence has GFX9 as canonical ++ * version. ++ */ ++#define AMD_FMT_MOD_TILE_GFX9_64K_S 9 ++ ++/* ++ * 64K_D for non-32 bpp is the same for GFX9/GFX10/GFX10_RBPLUS and hence has ++ * GFX9 as canonical version. ++ */ ++#define AMD_FMT_MOD_TILE_GFX9_64K_D 10 ++#define AMD_FMT_MOD_TILE_GFX9_64K_S_X 25 ++#define AMD_FMT_MOD_TILE_GFX9_64K_D_X 26 ++#define AMD_FMT_MOD_TILE_GFX9_64K_R_X 27 ++ ++#define AMD_FMT_MOD_DCC_BLOCK_64B 0 ++#define AMD_FMT_MOD_DCC_BLOCK_128B 1 ++#define AMD_FMT_MOD_DCC_BLOCK_256B 2 ++ ++#define AMD_FMT_MOD_TILE_VERSION_SHIFT 0 ++#define AMD_FMT_MOD_TILE_VERSION_MASK 0xFF ++#define AMD_FMT_MOD_TILE_SHIFT 8 ++#define AMD_FMT_MOD_TILE_MASK 0x1F ++ ++/* Whether DCC compression is enabled. */ ++#define AMD_FMT_MOD_DCC_SHIFT 13 ++#define AMD_FMT_MOD_DCC_MASK 0x1 ++ ++/* ++ * Whether to include two DCC surfaces, one which is rb & pipe aligned, and ++ * one which is not-aligned. ++ */ ++#define AMD_FMT_MOD_DCC_RETILE_SHIFT 14 ++#define AMD_FMT_MOD_DCC_RETILE_MASK 0x1 ++ ++/* Only set if DCC_RETILE = false */ ++#define AMD_FMT_MOD_DCC_PIPE_ALIGN_SHIFT 15 ++#define AMD_FMT_MOD_DCC_PIPE_ALIGN_MASK 0x1 ++ ++#define AMD_FMT_MOD_DCC_INDEPENDENT_64B_SHIFT 16 ++#define AMD_FMT_MOD_DCC_INDEPENDENT_64B_MASK 0x1 ++#define AMD_FMT_MOD_DCC_INDEPENDENT_128B_SHIFT 17 ++#define AMD_FMT_MOD_DCC_INDEPENDENT_128B_MASK 0x1 ++#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_SHIFT 18 ++#define AMD_FMT_MOD_DCC_MAX_COMPRESSED_BLOCK_MASK 0x3 ++ ++/* ++ * DCC supports embedding some clear colors directly in the DCC surface. ++ * However, on older GPUs the rendering HW ignores the embedded clear color ++ * and prefers the driver provided color. This necessitates doing a fastclear ++ * eliminate operation before a process transfers control. ++ * ++ * If this bit is set that means the fastclear eliminate is not needed for these ++ * embeddable colors. ++ */ ++#define AMD_FMT_MOD_DCC_CONSTANT_ENCODE_SHIFT 20 ++#define AMD_FMT_MOD_DCC_CONSTANT_ENCODE_MASK 0x1 ++ ++/* ++ * The below fields are for accounting for per GPU differences. These are only ++ * relevant for GFX9 and later and if the tile field is *_X/_T. ++ * ++ * PIPE_XOR_BITS = always needed ++ * BANK_XOR_BITS = only for TILE_VER_GFX9 ++ * PACKERS = only for TILE_VER_GFX10_RBPLUS ++ * RB = only for TILE_VER_GFX9 & DCC ++ * PIPE = only for TILE_VER_GFX9 & DCC & (DCC_RETILE | DCC_PIPE_ALIGN) ++ */ ++#define AMD_FMT_MOD_PIPE_XOR_BITS_SHIFT 21 ++#define AMD_FMT_MOD_PIPE_XOR_BITS_MASK 0x7 ++#define AMD_FMT_MOD_BANK_XOR_BITS_SHIFT 24 ++#define AMD_FMT_MOD_BANK_XOR_BITS_MASK 0x7 ++#define AMD_FMT_MOD_PACKERS_SHIFT 27 ++#define AMD_FMT_MOD_PACKERS_MASK 0x7 ++#define AMD_FMT_MOD_RB_SHIFT 30 ++#define AMD_FMT_MOD_RB_MASK 0x7 ++#define AMD_FMT_MOD_PIPE_SHIFT 33 ++#define AMD_FMT_MOD_PIPE_MASK 0x7 ++ ++#define AMD_FMT_MOD_SET(field, value) \ ++ ((uint64_t)(value) << AMD_FMT_MOD_##field##_SHIFT) ++#define AMD_FMT_MOD_GET(field, value) \ ++ (((value) >> AMD_FMT_MOD_##field##_SHIFT) & AMD_FMT_MOD_##field##_MASK) ++#define AMD_FMT_MOD_CLEAR(field) \ ++ (~((uint64_t)AMD_FMT_MOD_##field##_MASK << AMD_FMT_MOD_##field##_SHIFT)) ++ ++#if defined(__cplusplus) ++} ++#endif ++ ++#endif /* DRM_FOURCC_H */ +diff --git a/third_party/drm/drm/drm_mode.h b/third_party/drm/drm/drm_mode.h +new file mode 100644 +index 000000000000..e1e351682872 +--- /dev/null ++++ b/third_party/drm/drm/drm_mode.h +@@ -0,0 +1,1217 @@ ++/* ++ * Copyright (c) 2007 Dave Airlie ++ * Copyright (c) 2007 Jakob Bornecrantz ++ * Copyright (c) 2008 Red Hat Inc. ++ * Copyright (c) 2007-2008 Tungsten Graphics, Inc., Cedar Park, TX., USA ++ * Copyright (c) 2007-2008 Intel Corporation ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. ++ */ ++ ++#ifndef _DRM_MODE_H ++#define _DRM_MODE_H ++ ++#include "drm.h" ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++/** ++ * DOC: overview ++ * ++ * DRM exposes many UAPI and structure definition to have a consistent ++ * and standardized interface with user. ++ * Userspace can refer to these structure definitions and UAPI formats ++ * to communicate to driver ++ */ ++ ++#define DRM_CONNECTOR_NAME_LEN 32 ++#define DRM_DISPLAY_MODE_LEN 32 ++#define DRM_PROP_NAME_LEN 32 ++ ++#define DRM_MODE_TYPE_BUILTIN (1<<0) /* deprecated */ ++#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN) /* deprecated */ ++#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN) /* deprecated */ ++#define DRM_MODE_TYPE_PREFERRED (1<<3) ++#define DRM_MODE_TYPE_DEFAULT (1<<4) /* deprecated */ ++#define DRM_MODE_TYPE_USERDEF (1<<5) ++#define DRM_MODE_TYPE_DRIVER (1<<6) ++ ++#define DRM_MODE_TYPE_ALL (DRM_MODE_TYPE_PREFERRED | \ ++ DRM_MODE_TYPE_USERDEF | \ ++ DRM_MODE_TYPE_DRIVER) ++ ++/* Video mode flags */ ++/* bit compatible with the xrandr RR_ definitions (bits 0-13) ++ * ++ * ABI warning: Existing userspace really expects ++ * the mode flags to match the xrandr definitions. Any ++ * changes that don't match the xrandr definitions will ++ * likely need a new client cap or some other mechanism ++ * to avoid breaking existing userspace. This includes ++ * allocating new flags in the previously unused bits! ++ */ ++#define DRM_MODE_FLAG_PHSYNC (1<<0) ++#define DRM_MODE_FLAG_NHSYNC (1<<1) ++#define DRM_MODE_FLAG_PVSYNC (1<<2) ++#define DRM_MODE_FLAG_NVSYNC (1<<3) ++#define DRM_MODE_FLAG_INTERLACE (1<<4) ++#define DRM_MODE_FLAG_DBLSCAN (1<<5) ++#define DRM_MODE_FLAG_CSYNC (1<<6) ++#define DRM_MODE_FLAG_PCSYNC (1<<7) ++#define DRM_MODE_FLAG_NCSYNC (1<<8) ++#define DRM_MODE_FLAG_HSKEW (1<<9) /* hskew provided */ ++#define DRM_MODE_FLAG_BCAST (1<<10) /* deprecated */ ++#define DRM_MODE_FLAG_PIXMUX (1<<11) /* deprecated */ ++#define DRM_MODE_FLAG_DBLCLK (1<<12) ++#define DRM_MODE_FLAG_CLKDIV2 (1<<13) ++ /* ++ * When adding a new stereo mode don't forget to adjust DRM_MODE_FLAGS_3D_MAX ++ * (define not exposed to user space). ++ */ ++#define DRM_MODE_FLAG_3D_MASK (0x1f<<14) ++#define DRM_MODE_FLAG_3D_NONE (0<<14) ++#define DRM_MODE_FLAG_3D_FRAME_PACKING (1<<14) ++#define DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE (2<<14) ++#define DRM_MODE_FLAG_3D_LINE_ALTERNATIVE (3<<14) ++#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL (4<<14) ++#define DRM_MODE_FLAG_3D_L_DEPTH (5<<14) ++#define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14) ++#define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14) ++#define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14) ++ ++/* Picture aspect ratio options */ ++#define DRM_MODE_PICTURE_ASPECT_NONE 0 ++#define DRM_MODE_PICTURE_ASPECT_4_3 1 ++#define DRM_MODE_PICTURE_ASPECT_16_9 2 ++#define DRM_MODE_PICTURE_ASPECT_64_27 3 ++#define DRM_MODE_PICTURE_ASPECT_256_135 4 ++ ++/* Content type options */ ++#define DRM_MODE_CONTENT_TYPE_NO_DATA 0 ++#define DRM_MODE_CONTENT_TYPE_GRAPHICS 1 ++#define DRM_MODE_CONTENT_TYPE_PHOTO 2 ++#define DRM_MODE_CONTENT_TYPE_CINEMA 3 ++#define DRM_MODE_CONTENT_TYPE_GAME 4 ++ ++/* Aspect ratio flag bitmask (4 bits 22:19) */ ++#define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19) ++#define DRM_MODE_FLAG_PIC_AR_NONE \ ++ (DRM_MODE_PICTURE_ASPECT_NONE<<19) ++#define DRM_MODE_FLAG_PIC_AR_4_3 \ ++ (DRM_MODE_PICTURE_ASPECT_4_3<<19) ++#define DRM_MODE_FLAG_PIC_AR_16_9 \ ++ (DRM_MODE_PICTURE_ASPECT_16_9<<19) ++#define DRM_MODE_FLAG_PIC_AR_64_27 \ ++ (DRM_MODE_PICTURE_ASPECT_64_27<<19) ++#define DRM_MODE_FLAG_PIC_AR_256_135 \ ++ (DRM_MODE_PICTURE_ASPECT_256_135<<19) ++ ++#define DRM_MODE_FLAG_ALL (DRM_MODE_FLAG_PHSYNC | \ ++ DRM_MODE_FLAG_NHSYNC | \ ++ DRM_MODE_FLAG_PVSYNC | \ ++ DRM_MODE_FLAG_NVSYNC | \ ++ DRM_MODE_FLAG_INTERLACE | \ ++ DRM_MODE_FLAG_DBLSCAN | \ ++ DRM_MODE_FLAG_CSYNC | \ ++ DRM_MODE_FLAG_PCSYNC | \ ++ DRM_MODE_FLAG_NCSYNC | \ ++ DRM_MODE_FLAG_HSKEW | \ ++ DRM_MODE_FLAG_DBLCLK | \ ++ DRM_MODE_FLAG_CLKDIV2 | \ ++ DRM_MODE_FLAG_3D_MASK) ++ ++/* DPMS flags */ ++/* bit compatible with the xorg definitions. */ ++#define DRM_MODE_DPMS_ON 0 ++#define DRM_MODE_DPMS_STANDBY 1 ++#define DRM_MODE_DPMS_SUSPEND 2 ++#define DRM_MODE_DPMS_OFF 3 ++ ++/* Scaling mode options */ ++#define DRM_MODE_SCALE_NONE 0 /* Unmodified timing (display or ++ software can still scale) */ ++#define DRM_MODE_SCALE_FULLSCREEN 1 /* Full screen, ignore aspect */ ++#define DRM_MODE_SCALE_CENTER 2 /* Centered, no scaling */ ++#define DRM_MODE_SCALE_ASPECT 3 /* Full screen, preserve aspect */ ++ ++/* Dithering mode options */ ++#define DRM_MODE_DITHERING_OFF 0 ++#define DRM_MODE_DITHERING_ON 1 ++#define DRM_MODE_DITHERING_AUTO 2 ++ ++/* Dirty info options */ ++#define DRM_MODE_DIRTY_OFF 0 ++#define DRM_MODE_DIRTY_ON 1 ++#define DRM_MODE_DIRTY_ANNOTATE 2 ++ ++/* Link Status options */ ++#define DRM_MODE_LINK_STATUS_GOOD 0 ++#define DRM_MODE_LINK_STATUS_BAD 1 ++ ++/* ++ * DRM_MODE_ROTATE_ ++ * ++ * Signals that a drm plane is been rotated degrees in counter ++ * clockwise direction. ++ * ++ * This define is provided as a convenience, looking up the property id ++ * using the name->prop id lookup is the preferred method. ++ */ ++#define DRM_MODE_ROTATE_0 (1<<0) ++#define DRM_MODE_ROTATE_90 (1<<1) ++#define DRM_MODE_ROTATE_180 (1<<2) ++#define DRM_MODE_ROTATE_270 (1<<3) ++ ++/* ++ * DRM_MODE_ROTATE_MASK ++ * ++ * Bitmask used to look for drm plane rotations. ++ */ ++#define DRM_MODE_ROTATE_MASK (\ ++ DRM_MODE_ROTATE_0 | \ ++ DRM_MODE_ROTATE_90 | \ ++ DRM_MODE_ROTATE_180 | \ ++ DRM_MODE_ROTATE_270) ++ ++/* ++ * DRM_MODE_REFLECT_ ++ * ++ * Signals that the contents of a drm plane is reflected along the axis, ++ * in the same way as mirroring. ++ * See kerneldoc chapter "Plane Composition Properties" for more details. ++ * ++ * This define is provided as a convenience, looking up the property id ++ * using the name->prop id lookup is the preferred method. ++ */ ++#define DRM_MODE_REFLECT_X (1<<4) ++#define DRM_MODE_REFLECT_Y (1<<5) ++ ++/* ++ * DRM_MODE_REFLECT_MASK ++ * ++ * Bitmask used to look for drm plane reflections. ++ */ ++#define DRM_MODE_REFLECT_MASK (\ ++ DRM_MODE_REFLECT_X | \ ++ DRM_MODE_REFLECT_Y) ++ ++/* Content Protection Flags */ ++#define DRM_MODE_CONTENT_PROTECTION_UNDESIRED 0 ++#define DRM_MODE_CONTENT_PROTECTION_DESIRED 1 ++#define DRM_MODE_CONTENT_PROTECTION_ENABLED 2 ++ ++/** ++ * struct drm_mode_modeinfo - Display mode information. ++ * @clock: pixel clock in kHz ++ * @hdisplay: horizontal display size ++ * @hsync_start: horizontal sync start ++ * @hsync_end: horizontal sync end ++ * @htotal: horizontal total size ++ * @hskew: horizontal skew ++ * @vdisplay: vertical display size ++ * @vsync_start: vertical sync start ++ * @vsync_end: vertical sync end ++ * @vtotal: vertical total size ++ * @vscan: vertical scan ++ * @vrefresh: approximate vertical refresh rate in Hz ++ * @flags: bitmask of misc. flags, see DRM_MODE_FLAG_* defines ++ * @type: bitmask of type flags, see DRM_MODE_TYPE_* defines ++ * @name: string describing the mode resolution ++ * ++ * This is the user-space API display mode information structure. For the ++ * kernel version see struct drm_display_mode. ++ */ ++struct drm_mode_modeinfo { ++ __u32 clock; ++ __u16 hdisplay; ++ __u16 hsync_start; ++ __u16 hsync_end; ++ __u16 htotal; ++ __u16 hskew; ++ __u16 vdisplay; ++ __u16 vsync_start; ++ __u16 vsync_end; ++ __u16 vtotal; ++ __u16 vscan; ++ ++ __u32 vrefresh; ++ ++ __u32 flags; ++ __u32 type; ++ char name[DRM_DISPLAY_MODE_LEN]; ++}; ++ ++struct drm_mode_card_res { ++ __u64 fb_id_ptr; ++ __u64 crtc_id_ptr; ++ __u64 connector_id_ptr; ++ __u64 encoder_id_ptr; ++ __u32 count_fbs; ++ __u32 count_crtcs; ++ __u32 count_connectors; ++ __u32 count_encoders; ++ __u32 min_width; ++ __u32 max_width; ++ __u32 min_height; ++ __u32 max_height; ++}; ++ ++struct drm_mode_crtc { ++ __u64 set_connectors_ptr; ++ __u32 count_connectors; ++ ++ __u32 crtc_id; /**< Id */ ++ __u32 fb_id; /**< Id of framebuffer */ ++ ++ __u32 x; /**< x Position on the framebuffer */ ++ __u32 y; /**< y Position on the framebuffer */ ++ ++ __u32 gamma_size; ++ __u32 mode_valid; ++ struct drm_mode_modeinfo mode; ++}; ++ ++#define DRM_MODE_PRESENT_TOP_FIELD (1<<0) ++#define DRM_MODE_PRESENT_BOTTOM_FIELD (1<<1) ++ ++/* Planes blend with or override other bits on the CRTC */ ++struct drm_mode_set_plane { ++ __u32 plane_id; ++ __u32 crtc_id; ++ __u32 fb_id; /* fb object contains surface format type */ ++ __u32 flags; /* see above flags */ ++ ++ /* Signed dest location allows it to be partially off screen */ ++ __s32 crtc_x; ++ __s32 crtc_y; ++ __u32 crtc_w; ++ __u32 crtc_h; ++ ++ /* Source values are 16.16 fixed point */ ++ __u32 src_x; ++ __u32 src_y; ++ __u32 src_h; ++ __u32 src_w; ++}; ++ ++/** ++ * struct drm_mode_get_plane - Get plane metadata. ++ * ++ * Userspace can perform a GETPLANE ioctl to retrieve information about a ++ * plane. ++ * ++ * To retrieve the number of formats supported, set @count_format_types to zero ++ * and call the ioctl. @count_format_types will be updated with the value. ++ * ++ * To retrieve these formats, allocate an array with the memory needed to store ++ * @count_format_types formats. Point @format_type_ptr to this array and call ++ * the ioctl again (with @count_format_types still set to the value returned in ++ * the first ioctl call). ++ */ ++struct drm_mode_get_plane { ++ /** ++ * @plane_id: Object ID of the plane whose information should be ++ * retrieved. Set by caller. ++ */ ++ __u32 plane_id; ++ ++ /** @crtc_id: Object ID of the current CRTC. */ ++ __u32 crtc_id; ++ /** @fb_id: Object ID of the current fb. */ ++ __u32 fb_id; ++ ++ /** ++ * @possible_crtcs: Bitmask of CRTC's compatible with the plane. CRTC's ++ * are created and they receive an index, which corresponds to their ++ * position in the bitmask. Bit N corresponds to ++ * :ref:`CRTC index` N. ++ */ ++ __u32 possible_crtcs; ++ /** @gamma_size: Never used. */ ++ __u32 gamma_size; ++ ++ /** @count_format_types: Number of formats. */ ++ __u32 count_format_types; ++ /** ++ * @format_type_ptr: Pointer to ``__u32`` array of formats that are ++ * supported by the plane. These formats do not require modifiers. ++ */ ++ __u64 format_type_ptr; ++}; ++ ++struct drm_mode_get_plane_res { ++ __u64 plane_id_ptr; ++ __u32 count_planes; ++}; ++ ++#define DRM_MODE_ENCODER_NONE 0 ++#define DRM_MODE_ENCODER_DAC 1 ++#define DRM_MODE_ENCODER_TMDS 2 ++#define DRM_MODE_ENCODER_LVDS 3 ++#define DRM_MODE_ENCODER_TVDAC 4 ++#define DRM_MODE_ENCODER_VIRTUAL 5 ++#define DRM_MODE_ENCODER_DSI 6 ++#define DRM_MODE_ENCODER_DPMST 7 ++#define DRM_MODE_ENCODER_DPI 8 ++ ++struct drm_mode_get_encoder { ++ __u32 encoder_id; ++ __u32 encoder_type; ++ ++ __u32 crtc_id; /**< Id of crtc */ ++ ++ __u32 possible_crtcs; ++ __u32 possible_clones; ++}; ++ ++/* This is for connectors with multiple signal types. */ ++/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */ ++enum drm_mode_subconnector { ++ DRM_MODE_SUBCONNECTOR_Automatic = 0, /* DVI-I, TV */ ++ DRM_MODE_SUBCONNECTOR_Unknown = 0, /* DVI-I, TV, DP */ ++ DRM_MODE_SUBCONNECTOR_VGA = 1, /* DP */ ++ DRM_MODE_SUBCONNECTOR_DVID = 3, /* DVI-I DP */ ++ DRM_MODE_SUBCONNECTOR_DVIA = 4, /* DVI-I */ ++ DRM_MODE_SUBCONNECTOR_Composite = 5, /* TV */ ++ DRM_MODE_SUBCONNECTOR_SVIDEO = 6, /* TV */ ++ DRM_MODE_SUBCONNECTOR_Component = 8, /* TV */ ++ DRM_MODE_SUBCONNECTOR_SCART = 9, /* TV */ ++ DRM_MODE_SUBCONNECTOR_DisplayPort = 10, /* DP */ ++ DRM_MODE_SUBCONNECTOR_HDMIA = 11, /* DP */ ++ DRM_MODE_SUBCONNECTOR_Native = 15, /* DP */ ++ DRM_MODE_SUBCONNECTOR_Wireless = 18, /* DP */ ++}; ++ ++#define DRM_MODE_CONNECTOR_Unknown 0 ++#define DRM_MODE_CONNECTOR_VGA 1 ++#define DRM_MODE_CONNECTOR_DVII 2 ++#define DRM_MODE_CONNECTOR_DVID 3 ++#define DRM_MODE_CONNECTOR_DVIA 4 ++#define DRM_MODE_CONNECTOR_Composite 5 ++#define DRM_MODE_CONNECTOR_SVIDEO 6 ++#define DRM_MODE_CONNECTOR_LVDS 7 ++#define DRM_MODE_CONNECTOR_Component 8 ++#define DRM_MODE_CONNECTOR_9PinDIN 9 ++#define DRM_MODE_CONNECTOR_DisplayPort 10 ++#define DRM_MODE_CONNECTOR_HDMIA 11 ++#define DRM_MODE_CONNECTOR_HDMIB 12 ++#define DRM_MODE_CONNECTOR_TV 13 ++#define DRM_MODE_CONNECTOR_eDP 14 ++#define DRM_MODE_CONNECTOR_VIRTUAL 15 ++#define DRM_MODE_CONNECTOR_DSI 16 ++#define DRM_MODE_CONNECTOR_DPI 17 ++#define DRM_MODE_CONNECTOR_WRITEBACK 18 ++#define DRM_MODE_CONNECTOR_SPI 19 ++#define DRM_MODE_CONNECTOR_USB 20 ++ ++/** ++ * struct drm_mode_get_connector - Get connector metadata. ++ * ++ * User-space can perform a GETCONNECTOR ioctl to retrieve information about a ++ * connector. User-space is expected to retrieve encoders, modes and properties ++ * by performing this ioctl at least twice: the first time to retrieve the ++ * number of elements, the second time to retrieve the elements themselves. ++ * ++ * To retrieve the number of elements, set @count_props and @count_encoders to ++ * zero, set @count_modes to 1, and set @modes_ptr to a temporary struct ++ * drm_mode_modeinfo element. ++ * ++ * To retrieve the elements, allocate arrays for @encoders_ptr, @modes_ptr, ++ * @props_ptr and @prop_values_ptr, then set @count_modes, @count_props and ++ * @count_encoders to their capacity. ++ * ++ * Performing the ioctl only twice may be racy: the number of elements may have ++ * changed with a hotplug event in-between the two ioctls. User-space is ++ * expected to retry the last ioctl until the number of elements stabilizes. ++ * The kernel won't fill any array which doesn't have the expected length. ++ * ++ * **Force-probing a connector** ++ * ++ * If the @count_modes field is set to zero and the DRM client is the current ++ * DRM master, the kernel will perform a forced probe on the connector to ++ * refresh the connector status, modes and EDID. A forced-probe can be slow, ++ * might cause flickering and the ioctl will block. ++ * ++ * User-space needs to force-probe connectors to ensure their metadata is ++ * up-to-date at startup and after receiving a hot-plug event. User-space ++ * may perform a forced-probe when the user explicitly requests it. User-space ++ * shouldn't perform a forced-probe in other situations. ++ */ ++struct drm_mode_get_connector { ++ /** @encoders_ptr: Pointer to ``__u32`` array of object IDs. */ ++ __u64 encoders_ptr; ++ /** @modes_ptr: Pointer to struct drm_mode_modeinfo array. */ ++ __u64 modes_ptr; ++ /** @props_ptr: Pointer to ``__u32`` array of property IDs. */ ++ __u64 props_ptr; ++ /** @prop_values_ptr: Pointer to ``__u64`` array of property values. */ ++ __u64 prop_values_ptr; ++ ++ /** @count_modes: Number of modes. */ ++ __u32 count_modes; ++ /** @count_props: Number of properties. */ ++ __u32 count_props; ++ /** @count_encoders: Number of encoders. */ ++ __u32 count_encoders; ++ ++ /** @encoder_id: Object ID of the current encoder. */ ++ __u32 encoder_id; ++ /** @connector_id: Object ID of the connector. */ ++ __u32 connector_id; ++ /** ++ * @connector_type: Type of the connector. ++ * ++ * See DRM_MODE_CONNECTOR_* defines. ++ */ ++ __u32 connector_type; ++ /** ++ * @connector_type_id: Type-specific connector number. ++ * ++ * This is not an object ID. This is a per-type connector number. Each ++ * (type, type_id) combination is unique across all connectors of a DRM ++ * device. ++ */ ++ __u32 connector_type_id; ++ ++ /** ++ * @connection: Status of the connector. ++ * ++ * See enum drm_connector_status. ++ */ ++ __u32 connection; ++ /** @mm_width: Width of the connected sink in millimeters. */ ++ __u32 mm_width; ++ /** @mm_height: Height of the connected sink in millimeters. */ ++ __u32 mm_height; ++ /** ++ * @subpixel: Subpixel order of the connected sink. ++ * ++ * See enum subpixel_order. ++ */ ++ __u32 subpixel; ++ ++ /** @pad: Padding, must be zero. */ ++ __u32 pad; ++}; ++ ++#define DRM_MODE_PROP_PENDING (1<<0) /* deprecated, do not use */ ++#define DRM_MODE_PROP_RANGE (1<<1) ++#define DRM_MODE_PROP_IMMUTABLE (1<<2) ++#define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */ ++#define DRM_MODE_PROP_BLOB (1<<4) ++#define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */ ++ ++/* non-extended types: legacy bitmask, one bit per type: */ ++#define DRM_MODE_PROP_LEGACY_TYPE ( \ ++ DRM_MODE_PROP_RANGE | \ ++ DRM_MODE_PROP_ENUM | \ ++ DRM_MODE_PROP_BLOB | \ ++ DRM_MODE_PROP_BITMASK) ++ ++/* extended-types: rather than continue to consume a bit per type, ++ * grab a chunk of the bits to use as integer type id. ++ */ ++#define DRM_MODE_PROP_EXTENDED_TYPE 0x0000ffc0 ++#define DRM_MODE_PROP_TYPE(n) ((n) << 6) ++#define DRM_MODE_PROP_OBJECT DRM_MODE_PROP_TYPE(1) ++#define DRM_MODE_PROP_SIGNED_RANGE DRM_MODE_PROP_TYPE(2) ++ ++/* the PROP_ATOMIC flag is used to hide properties from userspace that ++ * is not aware of atomic properties. This is mostly to work around ++ * older userspace (DDX drivers) that read/write each prop they find, ++ * witout being aware that this could be triggering a lengthy modeset. ++ */ ++#define DRM_MODE_PROP_ATOMIC 0x80000000 ++ ++/** ++ * struct drm_mode_property_enum - Description for an enum/bitfield entry. ++ * @value: numeric value for this enum entry. ++ * @name: symbolic name for this enum entry. ++ * ++ * See struct drm_property_enum for details. ++ */ ++struct drm_mode_property_enum { ++ __u64 value; ++ char name[DRM_PROP_NAME_LEN]; ++}; ++ ++/** ++ * struct drm_mode_get_property - Get property metadata. ++ * ++ * User-space can perform a GETPROPERTY ioctl to retrieve information about a ++ * property. The same property may be attached to multiple objects, see ++ * "Modeset Base Object Abstraction". ++ * ++ * The meaning of the @values_ptr field changes depending on the property type. ++ * See &drm_property.flags for more details. ++ * ++ * The @enum_blob_ptr and @count_enum_blobs fields are only meaningful when the ++ * property has the type &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK. For ++ * backwards compatibility, the kernel will always set @count_enum_blobs to ++ * zero when the property has the type &DRM_MODE_PROP_BLOB. User-space must ++ * ignore these two fields if the property has a different type. ++ * ++ * User-space is expected to retrieve values and enums by performing this ioctl ++ * at least twice: the first time to retrieve the number of elements, the ++ * second time to retrieve the elements themselves. ++ * ++ * To retrieve the number of elements, set @count_values and @count_enum_blobs ++ * to zero, then call the ioctl. @count_values will be updated with the number ++ * of elements. If the property has the type &DRM_MODE_PROP_ENUM or ++ * &DRM_MODE_PROP_BITMASK, @count_enum_blobs will be updated as well. ++ * ++ * To retrieve the elements themselves, allocate an array for @values_ptr and ++ * set @count_values to its capacity. If the property has the type ++ * &DRM_MODE_PROP_ENUM or &DRM_MODE_PROP_BITMASK, allocate an array for ++ * @enum_blob_ptr and set @count_enum_blobs to its capacity. Calling the ioctl ++ * again will fill the arrays. ++ */ ++struct drm_mode_get_property { ++ /** @values_ptr: Pointer to a ``__u64`` array. */ ++ __u64 values_ptr; ++ /** @enum_blob_ptr: Pointer to a struct drm_mode_property_enum array. */ ++ __u64 enum_blob_ptr; ++ ++ /** ++ * @prop_id: Object ID of the property which should be retrieved. Set ++ * by the caller. ++ */ ++ __u32 prop_id; ++ /** ++ * @flags: ``DRM_MODE_PROP_*`` bitfield. See &drm_property.flags for ++ * a definition of the flags. ++ */ ++ __u32 flags; ++ /** ++ * @name: Symbolic property name. User-space should use this field to ++ * recognize properties. ++ */ ++ char name[DRM_PROP_NAME_LEN]; ++ ++ /** @count_values: Number of elements in @values_ptr. */ ++ __u32 count_values; ++ /** @count_enum_blobs: Number of elements in @enum_blob_ptr. */ ++ __u32 count_enum_blobs; ++}; ++ ++struct drm_mode_connector_set_property { ++ __u64 value; ++ __u32 prop_id; ++ __u32 connector_id; ++}; ++ ++#define DRM_MODE_OBJECT_CRTC 0xcccccccc ++#define DRM_MODE_OBJECT_CONNECTOR 0xc0c0c0c0 ++#define DRM_MODE_OBJECT_ENCODER 0xe0e0e0e0 ++#define DRM_MODE_OBJECT_MODE 0xdededede ++#define DRM_MODE_OBJECT_PROPERTY 0xb0b0b0b0 ++#define DRM_MODE_OBJECT_FB 0xfbfbfbfb ++#define DRM_MODE_OBJECT_BLOB 0xbbbbbbbb ++#define DRM_MODE_OBJECT_PLANE 0xeeeeeeee ++#define DRM_MODE_OBJECT_ANY 0 ++ ++struct drm_mode_obj_get_properties { ++ __u64 props_ptr; ++ __u64 prop_values_ptr; ++ __u32 count_props; ++ __u32 obj_id; ++ __u32 obj_type; ++}; ++ ++struct drm_mode_obj_set_property { ++ __u64 value; ++ __u32 prop_id; ++ __u32 obj_id; ++ __u32 obj_type; ++}; ++ ++struct drm_mode_get_blob { ++ __u32 blob_id; ++ __u32 length; ++ __u64 data; ++}; ++ ++struct drm_mode_fb_cmd { ++ __u32 fb_id; ++ __u32 width; ++ __u32 height; ++ __u32 pitch; ++ __u32 bpp; ++ __u32 depth; ++ /* driver specific handle */ ++ __u32 handle; ++}; ++ ++#define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */ ++#define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */ ++ ++struct drm_mode_fb_cmd2 { ++ __u32 fb_id; ++ __u32 width; ++ __u32 height; ++ __u32 pixel_format; /* fourcc code from drm_fourcc.h */ ++ __u32 flags; /* see above flags */ ++ ++ /* ++ * In case of planar formats, this ioctl allows up to 4 ++ * buffer objects with offsets and pitches per plane. ++ * The pitch and offset order is dictated by the fourcc, ++ * e.g. NV12 (https://fourcc.org/yuv.php#NV12) is described as: ++ * ++ * YUV 4:2:0 image with a plane of 8 bit Y samples ++ * followed by an interleaved U/V plane containing ++ * 8 bit 2x2 subsampled colour difference samples. ++ * ++ * So it would consist of Y as offsets[0] and UV as ++ * offsets[1]. Note that offsets[0] will generally ++ * be 0 (but this is not required). ++ * ++ * To accommodate tiled, compressed, etc formats, a ++ * modifier can be specified. The default value of zero ++ * indicates "native" format as specified by the fourcc. ++ * Vendor specific modifier token. Note that even though ++ * it looks like we have a modifier per-plane, we in fact ++ * do not. The modifier for each plane must be identical. ++ * Thus all combinations of different data layouts for ++ * multi plane formats must be enumerated as separate ++ * modifiers. ++ */ ++ __u32 handles[4]; ++ __u32 pitches[4]; /* pitch for each plane */ ++ __u32 offsets[4]; /* offset of each plane */ ++ __u64 modifier[4]; /* ie, tiling, compress */ ++}; ++ ++#define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01 ++#define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02 ++#define DRM_MODE_FB_DIRTY_FLAGS 0x03 ++ ++#define DRM_MODE_FB_DIRTY_MAX_CLIPS 256 ++ ++/* ++ * Mark a region of a framebuffer as dirty. ++ * ++ * Some hardware does not automatically update display contents ++ * as a hardware or software draw to a framebuffer. This ioctl ++ * allows userspace to tell the kernel and the hardware what ++ * regions of the framebuffer have changed. ++ * ++ * The kernel or hardware is free to update more then just the ++ * region specified by the clip rects. The kernel or hardware ++ * may also delay and/or coalesce several calls to dirty into a ++ * single update. ++ * ++ * Userspace may annotate the updates, the annotates are a ++ * promise made by the caller that the change is either a copy ++ * of pixels or a fill of a single color in the region specified. ++ * ++ * If the DRM_MODE_FB_DIRTY_ANNOTATE_COPY flag is given then ++ * the number of updated regions are half of num_clips given, ++ * where the clip rects are paired in src and dst. The width and ++ * height of each one of the pairs must match. ++ * ++ * If the DRM_MODE_FB_DIRTY_ANNOTATE_FILL flag is given the caller ++ * promises that the region specified of the clip rects is filled ++ * completely with a single color as given in the color argument. ++ */ ++ ++struct drm_mode_fb_dirty_cmd { ++ __u32 fb_id; ++ __u32 flags; ++ __u32 color; ++ __u32 num_clips; ++ __u64 clips_ptr; ++}; ++ ++struct drm_mode_mode_cmd { ++ __u32 connector_id; ++ struct drm_mode_modeinfo mode; ++}; ++ ++#define DRM_MODE_CURSOR_BO 0x01 ++#define DRM_MODE_CURSOR_MOVE 0x02 ++#define DRM_MODE_CURSOR_FLAGS 0x03 ++ ++/* ++ * depending on the value in flags different members are used. ++ * ++ * CURSOR_BO uses ++ * crtc_id ++ * width ++ * height ++ * handle - if 0 turns the cursor off ++ * ++ * CURSOR_MOVE uses ++ * crtc_id ++ * x ++ * y ++ */ ++struct drm_mode_cursor { ++ __u32 flags; ++ __u32 crtc_id; ++ __s32 x; ++ __s32 y; ++ __u32 width; ++ __u32 height; ++ /* driver specific handle */ ++ __u32 handle; ++}; ++ ++struct drm_mode_cursor2 { ++ __u32 flags; ++ __u32 crtc_id; ++ __s32 x; ++ __s32 y; ++ __u32 width; ++ __u32 height; ++ /* driver specific handle */ ++ __u32 handle; ++ __s32 hot_x; ++ __s32 hot_y; ++}; ++ ++struct drm_mode_crtc_lut { ++ __u32 crtc_id; ++ __u32 gamma_size; ++ ++ /* pointers to arrays */ ++ __u64 red; ++ __u64 green; ++ __u64 blue; ++}; ++ ++struct drm_color_ctm { ++ /* ++ * Conversion matrix in S31.32 sign-magnitude ++ * (not two's complement!) format. ++ */ ++ __u64 matrix[9]; ++}; ++ ++struct drm_color_lut { ++ /* ++ * Values are mapped linearly to 0.0 - 1.0 range, with 0x0 == 0.0 and ++ * 0xffff == 1.0. ++ */ ++ __u16 red; ++ __u16 green; ++ __u16 blue; ++ __u16 reserved; ++}; ++ ++/** ++ * struct hdr_metadata_infoframe - HDR Metadata Infoframe Data. ++ * ++ * HDR Metadata Infoframe as per CTA 861.G spec. This is expected ++ * to match exactly with the spec. ++ * ++ * Userspace is expected to pass the metadata information as per ++ * the format described in this structure. ++ */ ++struct hdr_metadata_infoframe { ++ /** ++ * @eotf: Electro-Optical Transfer Function (EOTF) ++ * used in the stream. ++ */ ++ __u8 eotf; ++ /** ++ * @metadata_type: Static_Metadata_Descriptor_ID. ++ */ ++ __u8 metadata_type; ++ /** ++ * @display_primaries: Color Primaries of the Data. ++ * These are coded as unsigned 16-bit values in units of ++ * 0.00002, where 0x0000 represents zero and 0xC350 ++ * represents 1.0000. ++ * @display_primaries.x: X cordinate of color primary. ++ * @display_primaries.y: Y cordinate of color primary. ++ */ ++ struct { ++ __u16 x, y; ++ } display_primaries[3]; ++ /** ++ * @white_point: White Point of Colorspace Data. ++ * These are coded as unsigned 16-bit values in units of ++ * 0.00002, where 0x0000 represents zero and 0xC350 ++ * represents 1.0000. ++ * @white_point.x: X cordinate of whitepoint of color primary. ++ * @white_point.y: Y cordinate of whitepoint of color primary. ++ */ ++ struct { ++ __u16 x, y; ++ } white_point; ++ /** ++ * @max_display_mastering_luminance: Max Mastering Display Luminance. ++ * This value is coded as an unsigned 16-bit value in units of 1 cd/m2, ++ * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2. ++ */ ++ __u16 max_display_mastering_luminance; ++ /** ++ * @min_display_mastering_luminance: Min Mastering Display Luminance. ++ * This value is coded as an unsigned 16-bit value in units of ++ * 0.0001 cd/m2, where 0x0001 represents 0.0001 cd/m2 and 0xFFFF ++ * represents 6.5535 cd/m2. ++ */ ++ __u16 min_display_mastering_luminance; ++ /** ++ * @max_cll: Max Content Light Level. ++ * This value is coded as an unsigned 16-bit value in units of 1 cd/m2, ++ * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2. ++ */ ++ __u16 max_cll; ++ /** ++ * @max_fall: Max Frame Average Light Level. ++ * This value is coded as an unsigned 16-bit value in units of 1 cd/m2, ++ * where 0x0001 represents 1 cd/m2 and 0xFFFF represents 65535 cd/m2. ++ */ ++ __u16 max_fall; ++}; ++ ++/** ++ * struct hdr_output_metadata - HDR output metadata ++ * ++ * Metadata Information to be passed from userspace ++ */ ++struct hdr_output_metadata { ++ /** ++ * @metadata_type: Static_Metadata_Descriptor_ID. ++ */ ++ __u32 metadata_type; ++ /** ++ * @hdmi_metadata_type1: HDR Metadata Infoframe. ++ */ ++ union { ++ struct hdr_metadata_infoframe hdmi_metadata_type1; ++ }; ++}; ++ ++#define DRM_MODE_PAGE_FLIP_EVENT 0x01 ++#define DRM_MODE_PAGE_FLIP_ASYNC 0x02 ++#define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4 ++#define DRM_MODE_PAGE_FLIP_TARGET_RELATIVE 0x8 ++#define DRM_MODE_PAGE_FLIP_TARGET (DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE | \ ++ DRM_MODE_PAGE_FLIP_TARGET_RELATIVE) ++#define DRM_MODE_PAGE_FLIP_FLAGS (DRM_MODE_PAGE_FLIP_EVENT | \ ++ DRM_MODE_PAGE_FLIP_ASYNC | \ ++ DRM_MODE_PAGE_FLIP_TARGET) ++ ++/* ++ * Request a page flip on the specified crtc. ++ * ++ * This ioctl will ask KMS to schedule a page flip for the specified ++ * crtc. Once any pending rendering targeting the specified fb (as of ++ * ioctl time) has completed, the crtc will be reprogrammed to display ++ * that fb after the next vertical refresh. The ioctl returns ++ * immediately, but subsequent rendering to the current fb will block ++ * in the execbuffer ioctl until the page flip happens. If a page ++ * flip is already pending as the ioctl is called, EBUSY will be ++ * returned. ++ * ++ * Flag DRM_MODE_PAGE_FLIP_EVENT requests that drm sends back a vblank ++ * event (see drm.h: struct drm_event_vblank) when the page flip is ++ * done. The user_data field passed in with this ioctl will be ++ * returned as the user_data field in the vblank event struct. ++ * ++ * Flag DRM_MODE_PAGE_FLIP_ASYNC requests that the flip happen ++ * 'as soon as possible', meaning that it not delay waiting for vblank. ++ * This may cause tearing on the screen. ++ * ++ * The reserved field must be zero. ++ */ ++ ++struct drm_mode_crtc_page_flip { ++ __u32 crtc_id; ++ __u32 fb_id; ++ __u32 flags; ++ __u32 reserved; ++ __u64 user_data; ++}; ++ ++/* ++ * Request a page flip on the specified crtc. ++ * ++ * Same as struct drm_mode_crtc_page_flip, but supports new flags and ++ * re-purposes the reserved field: ++ * ++ * The sequence field must be zero unless either of the ++ * DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags is specified. When ++ * the ABSOLUTE flag is specified, the sequence field denotes the absolute ++ * vblank sequence when the flip should take effect. When the RELATIVE ++ * flag is specified, the sequence field denotes the relative (to the ++ * current one when the ioctl is called) vblank sequence when the flip ++ * should take effect. NOTE: DRM_IOCTL_WAIT_VBLANK must still be used to ++ * make sure the vblank sequence before the target one has passed before ++ * calling this ioctl. The purpose of the ++ * DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags is merely to clarify ++ * the target for when code dealing with a page flip runs during a ++ * vertical blank period. ++ */ ++ ++struct drm_mode_crtc_page_flip_target { ++ __u32 crtc_id; ++ __u32 fb_id; ++ __u32 flags; ++ __u32 sequence; ++ __u64 user_data; ++}; ++ ++/* create a dumb scanout buffer */ ++struct drm_mode_create_dumb { ++ __u32 height; ++ __u32 width; ++ __u32 bpp; ++ __u32 flags; ++ /* handle, pitch, size will be returned */ ++ __u32 handle; ++ __u32 pitch; ++ __u64 size; ++}; ++ ++/* set up for mmap of a dumb scanout buffer */ ++struct drm_mode_map_dumb { ++ /** Handle for the object being mapped. */ ++ __u32 handle; ++ __u32 pad; ++ /** ++ * Fake offset to use for subsequent mmap call ++ * ++ * This is a fixed-size type for 32/64 compatibility. ++ */ ++ __u64 offset; ++}; ++ ++struct drm_mode_destroy_dumb { ++ __u32 handle; ++}; ++ ++/* page-flip flags are valid, plus: */ ++#define DRM_MODE_ATOMIC_TEST_ONLY 0x0100 ++#define DRM_MODE_ATOMIC_NONBLOCK 0x0200 ++#define DRM_MODE_ATOMIC_ALLOW_MODESET 0x0400 ++ ++#define DRM_MODE_ATOMIC_FLAGS (\ ++ DRM_MODE_PAGE_FLIP_EVENT |\ ++ DRM_MODE_PAGE_FLIP_ASYNC |\ ++ DRM_MODE_ATOMIC_TEST_ONLY |\ ++ DRM_MODE_ATOMIC_NONBLOCK |\ ++ DRM_MODE_ATOMIC_ALLOW_MODESET) ++ ++struct drm_mode_atomic { ++ __u32 flags; ++ __u32 count_objs; ++ __u64 objs_ptr; ++ __u64 count_props_ptr; ++ __u64 props_ptr; ++ __u64 prop_values_ptr; ++ __u64 reserved; ++ __u64 user_data; ++}; ++ ++struct drm_format_modifier_blob { ++#define FORMAT_BLOB_CURRENT 1 ++ /* Version of this blob format */ ++ __u32 version; ++ ++ /* Flags */ ++ __u32 flags; ++ ++ /* Number of fourcc formats supported */ ++ __u32 count_formats; ++ ++ /* Where in this blob the formats exist (in bytes) */ ++ __u32 formats_offset; ++ ++ /* Number of drm_format_modifiers */ ++ __u32 count_modifiers; ++ ++ /* Where in this blob the modifiers exist (in bytes) */ ++ __u32 modifiers_offset; ++ ++ /* __u32 formats[] */ ++ /* struct drm_format_modifier modifiers[] */ ++}; ++ ++struct drm_format_modifier { ++ /* Bitmask of formats in get_plane format list this info applies to. The ++ * offset allows a sliding window of which 64 formats (bits). ++ * ++ * Some examples: ++ * In today's world with < 65 formats, and formats 0, and 2 are ++ * supported ++ * 0x0000000000000005 ++ * ^-offset = 0, formats = 5 ++ * ++ * If the number formats grew to 128, and formats 98-102 are ++ * supported with the modifier: ++ * ++ * 0x0000007c00000000 0000000000000000 ++ * ^ ++ * |__offset = 64, formats = 0x7c00000000 ++ * ++ */ ++ __u64 formats; ++ __u32 offset; ++ __u32 pad; ++ ++ /* The modifier that applies to the >get_plane format list bitmask. */ ++ __u64 modifier; ++}; ++ ++/** ++ * struct drm_mode_create_blob - Create New blob property ++ * ++ * Create a new 'blob' data property, copying length bytes from data pointer, ++ * and returning new blob ID. ++ */ ++struct drm_mode_create_blob { ++ /** @data: Pointer to data to copy. */ ++ __u64 data; ++ /** @length: Length of data to copy. */ ++ __u32 length; ++ /** @blob_id: Return: new property ID. */ ++ __u32 blob_id; ++}; ++ ++/** ++ * struct drm_mode_destroy_blob - Destroy user blob ++ * @blob_id: blob_id to destroy ++ * ++ * Destroy a user-created blob property. ++ * ++ * User-space can release blobs as soon as they do not need to refer to them by ++ * their blob object ID. For instance, if you are using a MODE_ID blob in an ++ * atomic commit and you will not make another commit re-using the same ID, you ++ * can destroy the blob as soon as the commit has been issued, without waiting ++ * for it to complete. ++ */ ++struct drm_mode_destroy_blob { ++ __u32 blob_id; ++}; ++ ++/** ++ * struct drm_mode_create_lease - Create lease ++ * ++ * Lease mode resources, creating another drm_master. ++ * ++ * The @object_ids array must reference at least one CRTC, one connector and ++ * one plane if &DRM_CLIENT_CAP_UNIVERSAL_PLANES is enabled. Alternatively, ++ * the lease can be completely empty. ++ */ ++struct drm_mode_create_lease { ++ /** @object_ids: Pointer to array of object ids (__u32) */ ++ __u64 object_ids; ++ /** @object_count: Number of object ids */ ++ __u32 object_count; ++ /** @flags: flags for new FD (O_CLOEXEC, etc) */ ++ __u32 flags; ++ ++ /** @lessee_id: Return: unique identifier for lessee. */ ++ __u32 lessee_id; ++ /** @fd: Return: file descriptor to new drm_master file */ ++ __u32 fd; ++}; ++ ++/** ++ * struct drm_mode_list_lessees - List lessees ++ * ++ * List lesses from a drm_master. ++ */ ++struct drm_mode_list_lessees { ++ /** ++ * @count_lessees: Number of lessees. ++ * ++ * On input, provides length of the array. ++ * On output, provides total number. No ++ * more than the input number will be written ++ * back, so two calls can be used to get ++ * the size and then the data. ++ */ ++ __u32 count_lessees; ++ /** @pad: Padding. */ ++ __u32 pad; ++ ++ /** ++ * @lessees_ptr: Pointer to lessees. ++ * ++ * Pointer to __u64 array of lessee ids ++ */ ++ __u64 lessees_ptr; ++}; ++ ++/** ++ * struct drm_mode_get_lease - Get Lease ++ * ++ * Get leased objects. ++ */ ++struct drm_mode_get_lease { ++ /** ++ * @count_objects: Number of leased objects. ++ * ++ * On input, provides length of the array. ++ * On output, provides total number. No ++ * more than the input number will be written ++ * back, so two calls can be used to get ++ * the size and then the data. ++ */ ++ __u32 count_objects; ++ /** @pad: Padding. */ ++ __u32 pad; ++ ++ /** ++ * @objects_ptr: Pointer to objects. ++ * ++ * Pointer to __u32 array of object ids. ++ */ ++ __u64 objects_ptr; ++}; ++ ++/** ++ * struct drm_mode_revoke_lease - Revoke lease ++ */ ++struct drm_mode_revoke_lease { ++ /** @lessee_id: Unique ID of lessee */ ++ __u32 lessee_id; ++}; ++ ++/** ++ * struct drm_mode_rect - Two dimensional rectangle. ++ * @x1: Horizontal starting coordinate (inclusive). ++ * @y1: Vertical starting coordinate (inclusive). ++ * @x2: Horizontal ending coordinate (exclusive). ++ * @y2: Vertical ending coordinate (exclusive). ++ * ++ * With drm subsystem using struct drm_rect to manage rectangular area this ++ * export it to user-space. ++ * ++ * Currently used by drm_mode_atomic blob property FB_DAMAGE_CLIPS. ++ */ ++struct drm_mode_rect { ++ __s32 x1; ++ __s32 y1; ++ __s32 x2; ++ __s32 y2; ++}; ++ ++#if defined(__cplusplus) ++} ++#endif ++ ++#endif +diff --git a/third_party/drm/drm/xf86drm.h b/third_party/drm/drm/xf86drm.h +new file mode 100644 +index 000000000000..501ab9e9d36d +--- /dev/null ++++ b/third_party/drm/drm/xf86drm.h +@@ -0,0 +1,966 @@ ++/** ++ * \file xf86drm.h ++ * OS-independent header for DRM user-level library interface. ++ * ++ * \author Rickard E. (Rik) Faith ++ */ ++ ++/* ++ * Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. ++ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. ++ * All Rights Reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ */ ++ ++#ifndef _XF86DRM_H_ ++#define _XF86DRM_H_ ++ ++#include ++#include ++#include ++#include ++ ++#if defined(__cplusplus) ++extern "C" { ++#endif ++ ++#ifndef DRM_MAX_MINOR ++#define DRM_MAX_MINOR 16 ++#endif ++ ++#if defined(__linux__) ++ ++#define DRM_IOCTL_NR(n) _IOC_NR(n) ++#define DRM_IOC_VOID _IOC_NONE ++#define DRM_IOC_READ _IOC_READ ++#define DRM_IOC_WRITE _IOC_WRITE ++#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE ++#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) ++ ++#else /* One of the *BSDs */ ++ ++#include ++#define DRM_IOCTL_NR(n) ((n) & 0xff) ++#define DRM_IOC_VOID IOC_VOID ++#define DRM_IOC_READ IOC_OUT ++#define DRM_IOC_WRITE IOC_IN ++#define DRM_IOC_READWRITE IOC_INOUT ++#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) ++ ++#endif ++ ++ /* Defaults, if nothing set in xf86config */ ++#define DRM_DEV_UID 0 ++#define DRM_DEV_GID 0 ++/* Default /dev/dri directory permissions 0755 */ ++#define DRM_DEV_DIRMODE \ ++ (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) ++#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) ++ ++#ifdef __OpenBSD__ ++#define DRM_DIR_NAME "/dev" ++#define DRM_PRIMARY_MINOR_NAME "drm" ++#define DRM_CONTROL_MINOR_NAME "drmC" ++#define DRM_RENDER_MINOR_NAME "drmR" ++#else ++#define DRM_DIR_NAME "/dev/dri" ++#define DRM_PRIMARY_MINOR_NAME "card" ++#define DRM_CONTROL_MINOR_NAME "controlD" ++#define DRM_RENDER_MINOR_NAME "renderD" ++#define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */ ++#endif ++ ++#define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d" ++#define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d" ++#define DRM_RENDER_DEV_NAME "%s/" DRM_RENDER_MINOR_NAME "%d" ++ ++#define DRM_NODE_NAME_MAX \ ++ (sizeof(DRM_DIR_NAME) + 1 /* slash */ \ ++ + MAX3(sizeof(DRM_PRIMARY_MINOR_NAME), \ ++ sizeof(DRM_CONTROL_MINOR_NAME), \ ++ sizeof(DRM_RENDER_MINOR_NAME)) \ ++ + sizeof("144") /* highest possible node number */ \ ++ + 1) /* NULL-terminator */ ++ ++#define DRM_ERR_NO_DEVICE (-1001) ++#define DRM_ERR_NO_ACCESS (-1002) ++#define DRM_ERR_NOT_ROOT (-1003) ++#define DRM_ERR_INVALID (-1004) ++#define DRM_ERR_NO_FD (-1005) ++ ++#define DRM_AGP_NO_HANDLE 0 ++ ++typedef unsigned int drmSize, *drmSizePtr; /**< For mapped regions */ ++typedef void *drmAddress, **drmAddressPtr; /**< For mapped regions */ ++ ++#if (__GNUC__ >= 3) ++#define DRM_PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a))) ++#else ++#define DRM_PRINTFLIKE(f, a) ++#endif ++ ++typedef struct _drmServerInfo { ++ int (*debug_print)(const char *format, va_list ap) DRM_PRINTFLIKE(1,0); ++ int (*load_module)(const char *name); ++ void (*get_perms)(gid_t *, mode_t *); ++} drmServerInfo, *drmServerInfoPtr; ++ ++typedef struct drmHashEntry { ++ int fd; ++ void (*f)(int, void *, void *); ++ void *tagTable; ++} drmHashEntry; ++ ++extern int drmIoctl(int fd, unsigned long request, void *arg); ++extern void *drmGetHashTable(void); ++extern drmHashEntry *drmGetEntry(int fd); ++ ++/** ++ * Driver version information. ++ * ++ * \sa drmGetVersion() and drmSetVersion(). ++ */ ++typedef struct _drmVersion { ++ int version_major; /**< Major version */ ++ int version_minor; /**< Minor version */ ++ int version_patchlevel; /**< Patch level */ ++ int name_len; /**< Length of name buffer */ ++ char *name; /**< Name of driver */ ++ int date_len; /**< Length of date buffer */ ++ char *date; /**< User-space buffer to hold date */ ++ int desc_len; /**< Length of desc buffer */ ++ char *desc; /**< User-space buffer to hold desc */ ++} drmVersion, *drmVersionPtr; ++ ++typedef struct _drmStats { ++ unsigned long count; /**< Number of data */ ++ struct { ++ unsigned long value; /**< Value from kernel */ ++ const char *long_format; /**< Suggested format for long_name */ ++ const char *long_name; /**< Long name for value */ ++ const char *rate_format; /**< Suggested format for rate_name */ ++ const char *rate_name; /**< Short name for value per second */ ++ int isvalue; /**< True if value (vs. counter) */ ++ const char *mult_names; /**< Multiplier names (e.g., "KGM") */ ++ int mult; /**< Multiplier value (e.g., 1024) */ ++ int verbose; /**< Suggest only in verbose output */ ++ } data[15]; ++} drmStatsT; ++ ++ ++ /* All of these enums *MUST* match with the ++ kernel implementation -- so do *NOT* ++ change them! (The drmlib implementation ++ will just copy the flags instead of ++ translating them.) */ ++typedef enum { ++ DRM_FRAME_BUFFER = 0, /**< WC, no caching, no core dump */ ++ DRM_REGISTERS = 1, /**< no caching, no core dump */ ++ DRM_SHM = 2, /**< shared, cached */ ++ DRM_AGP = 3, /**< AGP/GART */ ++ DRM_SCATTER_GATHER = 4, /**< PCI scatter/gather */ ++ DRM_CONSISTENT = 5 /**< PCI consistent */ ++} drmMapType; ++ ++typedef enum { ++ DRM_RESTRICTED = 0x0001, /**< Cannot be mapped to client-virtual */ ++ DRM_READ_ONLY = 0x0002, /**< Read-only in client-virtual */ ++ DRM_LOCKED = 0x0004, /**< Physical pages locked */ ++ DRM_KERNEL = 0x0008, /**< Kernel requires access */ ++ DRM_WRITE_COMBINING = 0x0010, /**< Use write-combining, if available */ ++ DRM_CONTAINS_LOCK = 0x0020, /**< SHM page that contains lock */ ++ DRM_REMOVABLE = 0x0040 /**< Removable mapping */ ++} drmMapFlags; ++ ++/** ++ * \warning These values *MUST* match drm.h ++ */ ++typedef enum { ++ /** \name Flags for DMA buffer dispatch */ ++ /*@{*/ ++ DRM_DMA_BLOCK = 0x01, /**< ++ * Block until buffer dispatched. ++ * ++ * \note the buffer may not yet have been ++ * processed by the hardware -- getting a ++ * hardware lock with the hardware quiescent ++ * will ensure that the buffer has been ++ * processed. ++ */ ++ DRM_DMA_WHILE_LOCKED = 0x02, /**< Dispatch while lock held */ ++ DRM_DMA_PRIORITY = 0x04, /**< High priority dispatch */ ++ /*@}*/ ++ ++ /** \name Flags for DMA buffer request */ ++ /*@{*/ ++ DRM_DMA_WAIT = 0x10, /**< Wait for free buffers */ ++ DRM_DMA_SMALLER_OK = 0x20, /**< Smaller-than-requested buffers OK */ ++ DRM_DMA_LARGER_OK = 0x40 /**< Larger-than-requested buffers OK */ ++ /*@}*/ ++} drmDMAFlags; ++ ++typedef enum { ++ DRM_PAGE_ALIGN = 0x01, ++ DRM_AGP_BUFFER = 0x02, ++ DRM_SG_BUFFER = 0x04, ++ DRM_FB_BUFFER = 0x08, ++ DRM_PCI_BUFFER_RO = 0x10 ++} drmBufDescFlags; ++ ++typedef enum { ++ DRM_LOCK_READY = 0x01, /**< Wait until hardware is ready for DMA */ ++ DRM_LOCK_QUIESCENT = 0x02, /**< Wait until hardware quiescent */ ++ DRM_LOCK_FLUSH = 0x04, /**< Flush this context's DMA queue first */ ++ DRM_LOCK_FLUSH_ALL = 0x08, /**< Flush all DMA queues first */ ++ /* These *HALT* flags aren't supported yet ++ -- they will be used to support the ++ full-screen DGA-like mode. */ ++ DRM_HALT_ALL_QUEUES = 0x10, /**< Halt all current and future queues */ ++ DRM_HALT_CUR_QUEUES = 0x20 /**< Halt all current queues */ ++} drmLockFlags; ++ ++typedef enum { ++ DRM_CONTEXT_PRESERVED = 0x01, /**< This context is preserved and ++ never swapped. */ ++ DRM_CONTEXT_2DONLY = 0x02 /**< This context is for 2D rendering only. */ ++} drm_context_tFlags, *drm_context_tFlagsPtr; ++ ++typedef struct _drmBufDesc { ++ int count; /**< Number of buffers of this size */ ++ int size; /**< Size in bytes */ ++ int low_mark; /**< Low water mark */ ++ int high_mark; /**< High water mark */ ++} drmBufDesc, *drmBufDescPtr; ++ ++typedef struct _drmBufInfo { ++ int count; /**< Number of buffers described in list */ ++ drmBufDescPtr list; /**< List of buffer descriptions */ ++} drmBufInfo, *drmBufInfoPtr; ++ ++typedef struct _drmBuf { ++ int idx; /**< Index into the master buffer list */ ++ int total; /**< Buffer size */ ++ int used; /**< Amount of buffer in use (for DMA) */ ++ drmAddress address; /**< Address */ ++} drmBuf, *drmBufPtr; ++ ++/** ++ * Buffer mapping information. ++ * ++ * Used by drmMapBufs() and drmUnmapBufs() to store information about the ++ * mapped buffers. ++ */ ++typedef struct _drmBufMap { ++ int count; /**< Number of buffers mapped */ ++ drmBufPtr list; /**< Buffers */ ++} drmBufMap, *drmBufMapPtr; ++ ++typedef struct _drmLock { ++ volatile unsigned int lock; ++ char padding[60]; ++ /* This is big enough for most current (and future?) architectures: ++ DEC Alpha: 32 bytes ++ Intel Merced: ? ++ Intel P5/PPro/PII/PIII: 32 bytes ++ Intel StrongARM: 32 bytes ++ Intel i386/i486: 16 bytes ++ MIPS: 32 bytes (?) ++ Motorola 68k: 16 bytes ++ Motorola PowerPC: 32 bytes ++ Sun SPARC: 32 bytes ++ */ ++} drmLock, *drmLockPtr; ++ ++/** ++ * Indices here refer to the offset into ++ * list in drmBufInfo ++ */ ++typedef struct _drmDMAReq { ++ drm_context_t context; /**< Context handle */ ++ int send_count; /**< Number of buffers to send */ ++ int *send_list; /**< List of handles to buffers */ ++ int *send_sizes; /**< Lengths of data to send, in bytes */ ++ drmDMAFlags flags; /**< Flags */ ++ int request_count; /**< Number of buffers requested */ ++ int request_size; /**< Desired size of buffers requested */ ++ int *request_list; /**< Buffer information */ ++ int *request_sizes; /**< Minimum acceptable sizes */ ++ int granted_count; /**< Number of buffers granted at this size */ ++} drmDMAReq, *drmDMAReqPtr; ++ ++typedef struct _drmRegion { ++ drm_handle_t handle; ++ unsigned int offset; ++ drmSize size; ++ drmAddress map; ++} drmRegion, *drmRegionPtr; ++ ++typedef struct _drmTextureRegion { ++ unsigned char next; ++ unsigned char prev; ++ unsigned char in_use; ++ unsigned char padding; /**< Explicitly pad this out */ ++ unsigned int age; ++} drmTextureRegion, *drmTextureRegionPtr; ++ ++ ++typedef enum { ++ DRM_VBLANK_ABSOLUTE = 0x0, /**< Wait for specific vblank sequence number */ ++ DRM_VBLANK_RELATIVE = 0x1, /**< Wait for given number of vblanks */ ++ /* bits 1-6 are reserved for high crtcs */ ++ DRM_VBLANK_HIGH_CRTC_MASK = 0x0000003e, ++ DRM_VBLANK_EVENT = 0x4000000, /**< Send event instead of blocking */ ++ DRM_VBLANK_FLIP = 0x8000000, /**< Scheduled buffer swap should flip */ ++ DRM_VBLANK_NEXTONMISS = 0x10000000, /**< If missed, wait for next vblank */ ++ DRM_VBLANK_SECONDARY = 0x20000000, /**< Secondary display controller */ ++ DRM_VBLANK_SIGNAL = 0x40000000 /* Send signal instead of blocking */ ++} drmVBlankSeqType; ++#define DRM_VBLANK_HIGH_CRTC_SHIFT 1 ++ ++typedef struct _drmVBlankReq { ++ drmVBlankSeqType type; ++ unsigned int sequence; ++ unsigned long signal; ++} drmVBlankReq, *drmVBlankReqPtr; ++ ++typedef struct _drmVBlankReply { ++ drmVBlankSeqType type; ++ unsigned int sequence; ++ long tval_sec; ++ long tval_usec; ++} drmVBlankReply, *drmVBlankReplyPtr; ++ ++typedef union _drmVBlank { ++ drmVBlankReq request; ++ drmVBlankReply reply; ++} drmVBlank, *drmVBlankPtr; ++ ++typedef struct _drmSetVersion { ++ int drm_di_major; ++ int drm_di_minor; ++ int drm_dd_major; ++ int drm_dd_minor; ++} drmSetVersion, *drmSetVersionPtr; ++ ++#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) ++ ++#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ ++#define DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ ++ ++#if defined(__GNUC__) && (__GNUC__ >= 2) ++# if defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__) ++ /* Reflect changes here to drmP.h */ ++#define DRM_CAS(lock,old,new,__ret) \ ++ do { \ ++ int __dummy; /* Can't mark eax as clobbered */ \ ++ __asm__ __volatile__( \ ++ "lock ; cmpxchg %4,%1\n\t" \ ++ "setnz %0" \ ++ : "=d" (__ret), \ ++ "=m" (__drm_dummy_lock(lock)), \ ++ "=a" (__dummy) \ ++ : "2" (old), \ ++ "r" (new)); \ ++ } while (0) ++ ++#elif defined(__alpha__) ++ ++#define DRM_CAS(lock, old, new, ret) \ ++ do { \ ++ int tmp, old32; \ ++ __asm__ __volatile__( \ ++ " addl $31, %5, %3\n" \ ++ "1: ldl_l %0, %2\n" \ ++ " cmpeq %0, %3, %1\n" \ ++ " beq %1, 2f\n" \ ++ " mov %4, %0\n" \ ++ " stl_c %0, %2\n" \ ++ " beq %0, 3f\n" \ ++ " mb\n" \ ++ "2: cmpeq %1, 0, %1\n" \ ++ ".subsection 2\n" \ ++ "3: br 1b\n" \ ++ ".previous" \ ++ : "=&r"(tmp), "=&r"(ret), \ ++ "=m"(__drm_dummy_lock(lock)), \ ++ "=&r"(old32) \ ++ : "r"(new), "r"(old) \ ++ : "memory"); \ ++ } while (0) ++ ++#elif defined(__sparc__) ++ ++#define DRM_CAS(lock,old,new,__ret) \ ++do { register unsigned int __old __asm("o0"); \ ++ register unsigned int __new __asm("o1"); \ ++ register volatile unsigned int *__lock __asm("o2"); \ ++ __old = old; \ ++ __new = new; \ ++ __lock = (volatile unsigned int *)lock; \ ++ __asm__ __volatile__( \ ++ /*"cas [%2], %3, %0"*/ \ ++ ".word 0xd3e29008\n\t" \ ++ /*"membar #StoreStore | #StoreLoad"*/ \ ++ ".word 0x8143e00a" \ ++ : "=&r" (__new) \ ++ : "0" (__new), \ ++ "r" (__lock), \ ++ "r" (__old) \ ++ : "memory"); \ ++ __ret = (__new != __old); \ ++} while(0) ++ ++#elif defined(__ia64__) ++ ++#ifdef __INTEL_COMPILER ++/* this currently generates bad code (missing stop bits)... */ ++#include ++ ++#define DRM_CAS(lock,old,new,__ret) \ ++ do { \ ++ unsigned long __result, __old = (old) & 0xffffffff; \ ++ __mf(); \ ++ __result = _InterlockedCompareExchange_acq(&__drm_dummy_lock(lock), (new), __old);\ ++ __ret = (__result) != (__old); \ ++/* __ret = (__sync_val_compare_and_swap(&__drm_dummy_lock(lock), \ ++ (old), (new)) \ ++ != (old)); */\ ++ } while (0) ++ ++#else ++#define DRM_CAS(lock,old,new,__ret) \ ++ do { \ ++ unsigned int __result, __old = (old); \ ++ __asm__ __volatile__( \ ++ "mf\n" \ ++ "mov ar.ccv=%2\n" \ ++ ";;\n" \ ++ "cmpxchg4.acq %0=%1,%3,ar.ccv" \ ++ : "=r" (__result), "=m" (__drm_dummy_lock(lock)) \ ++ : "r" ((unsigned long)__old), "r" (new) \ ++ : "memory"); \ ++ __ret = (__result) != (__old); \ ++ } while (0) ++ ++#endif ++ ++#elif defined(__powerpc__) ++ ++#define DRM_CAS(lock,old,new,__ret) \ ++ do { \ ++ __asm__ __volatile__( \ ++ "sync;" \ ++ "0: lwarx %0,0,%1;" \ ++ " xor. %0,%3,%0;" \ ++ " bne 1f;" \ ++ " stwcx. %2,0,%1;" \ ++ " bne- 0b;" \ ++ "1: " \ ++ "sync;" \ ++ : "=&r"(__ret) \ ++ : "r"(lock), "r"(new), "r"(old) \ ++ : "cr0", "memory"); \ ++ } while (0) ++ ++# elif defined (__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ ++ || defined (__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ ++ || defined (__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \ ++ || defined (__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ ++ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ ++ || defined(__ARM_ARCH_7EM__) ++ /* excluding ARMv4/ARMv5 and lower (lacking ldrex/strex support) */ ++ #undef DRM_DEV_MODE ++ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) ++ ++ #define DRM_CAS(lock,old,new,__ret) \ ++ do { \ ++ __asm__ __volatile__ ( \ ++ "1: ldrex %0, [%1]\n" \ ++ " teq %0, %2\n" \ ++ " ite eq\n" \ ++ " strexeq %0, %3, [%1]\n" \ ++ " movne %0, #1\n" \ ++ : "=&r" (__ret) \ ++ : "r" (lock), "r" (old), "r" (new) \ ++ : "cc","memory"); \ ++ } while (0) ++ ++#endif /* architecture */ ++#endif /* __GNUC__ >= 2 */ ++ ++#ifndef DRM_CAS ++#define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */ ++#endif ++ ++#if defined(__alpha__) ++#define DRM_CAS_RESULT(_result) long _result ++#elif defined(__powerpc__) ++#define DRM_CAS_RESULT(_result) int _result ++#else ++#define DRM_CAS_RESULT(_result) char _result ++#endif ++ ++#define DRM_LIGHT_LOCK(fd,lock,context) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ DRM_CAS(lock,context,DRM_LOCK_HELD|context,__ret); \ ++ if (__ret) drmGetLock(fd,context,0); \ ++ } while(0) ++ ++ /* This one counts fast locks -- for ++ benchmarking only. */ ++#define DRM_LIGHT_LOCK_COUNT(fd,lock,context,count) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ DRM_CAS(lock,context,DRM_LOCK_HELD|context,__ret); \ ++ if (__ret) drmGetLock(fd,context,0); \ ++ else ++count; \ ++ } while(0) ++ ++#define DRM_LOCK(fd,lock,context,flags) \ ++ do { \ ++ if (flags) drmGetLock(fd,context,flags); \ ++ else DRM_LIGHT_LOCK(fd,lock,context); \ ++ } while(0) ++ ++#define DRM_UNLOCK(fd,lock,context) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ DRM_CAS(lock,DRM_LOCK_HELD|context,context,__ret); \ ++ if (__ret) drmUnlock(fd,context); \ ++ } while(0) ++ ++ /* Simple spin locks */ ++#define DRM_SPINLOCK(spin,val) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ do { \ ++ DRM_CAS(spin,0,val,__ret); \ ++ if (__ret) while ((spin)->lock); \ ++ } while (__ret); \ ++ } while(0) ++ ++#define DRM_SPINLOCK_TAKE(spin,val) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ int cur; \ ++ do { \ ++ cur = (*spin).lock; \ ++ DRM_CAS(spin,cur,val,__ret); \ ++ } while (__ret); \ ++ } while(0) ++ ++#define DRM_SPINLOCK_COUNT(spin,val,count,__ret) \ ++ do { \ ++ int __i; \ ++ __ret = 1; \ ++ for (__i = 0; __ret && __i < count; __i++) { \ ++ DRM_CAS(spin,0,val,__ret); \ ++ if (__ret) for (;__i < count && (spin)->lock; __i++); \ ++ } \ ++ } while(0) ++ ++#define DRM_SPINUNLOCK(spin,val) \ ++ do { \ ++ DRM_CAS_RESULT(__ret); \ ++ if ((*spin).lock == val) { /* else server stole lock */ \ ++ do { \ ++ DRM_CAS(spin,val,0,__ret); \ ++ } while (__ret); \ ++ } \ ++ } while(0) ++ ++ ++ ++/* General user-level programmer's API: unprivileged */ ++extern int drmAvailable(void); ++extern int drmOpen(const char *name, const char *busid); ++ ++#define DRM_NODE_PRIMARY 0 ++#define DRM_NODE_CONTROL 1 ++#define DRM_NODE_RENDER 2 ++#define DRM_NODE_MAX 3 ++ ++extern int drmOpenWithType(const char *name, const char *busid, ++ int type); ++ ++extern int drmOpenControl(int minor); ++extern int drmOpenRender(int minor); ++extern int drmClose(int fd); ++extern drmVersionPtr drmGetVersion(int fd); ++extern drmVersionPtr drmGetLibVersion(int fd); ++extern int drmGetCap(int fd, uint64_t capability, uint64_t *value); ++extern void drmFreeVersion(drmVersionPtr); ++extern int drmGetMagic(int fd, drm_magic_t * magic); ++extern char *drmGetBusid(int fd); ++extern int drmGetInterruptFromBusID(int fd, int busnum, int devnum, ++ int funcnum); ++extern int drmGetMap(int fd, int idx, drm_handle_t *offset, ++ drmSize *size, drmMapType *type, ++ drmMapFlags *flags, drm_handle_t *handle, ++ int *mtrr); ++extern int drmGetClient(int fd, int idx, int *auth, int *pid, ++ int *uid, unsigned long *magic, ++ unsigned long *iocs); ++extern int drmGetStats(int fd, drmStatsT *stats); ++extern int drmSetInterfaceVersion(int fd, drmSetVersion *version); ++extern int drmCommandNone(int fd, unsigned long drmCommandIndex); ++extern int drmCommandRead(int fd, unsigned long drmCommandIndex, ++ void *data, unsigned long size); ++extern int drmCommandWrite(int fd, unsigned long drmCommandIndex, ++ void *data, unsigned long size); ++extern int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, ++ void *data, unsigned long size); ++ ++/* General user-level programmer's API: X server (root) only */ ++extern void drmFreeBusid(const char *busid); ++extern int drmSetBusid(int fd, const char *busid); ++extern int drmAuthMagic(int fd, drm_magic_t magic); ++extern int drmAddMap(int fd, ++ drm_handle_t offset, ++ drmSize size, ++ drmMapType type, ++ drmMapFlags flags, ++ drm_handle_t * handle); ++extern int drmRmMap(int fd, drm_handle_t handle); ++extern int drmAddContextPrivateMapping(int fd, drm_context_t ctx_id, ++ drm_handle_t handle); ++ ++extern int drmAddBufs(int fd, int count, int size, ++ drmBufDescFlags flags, ++ int agp_offset); ++extern int drmMarkBufs(int fd, double low, double high); ++extern int drmCreateContext(int fd, drm_context_t * handle); ++extern int drmSetContextFlags(int fd, drm_context_t context, ++ drm_context_tFlags flags); ++extern int drmGetContextFlags(int fd, drm_context_t context, ++ drm_context_tFlagsPtr flags); ++extern int drmAddContextTag(int fd, drm_context_t context, void *tag); ++extern int drmDelContextTag(int fd, drm_context_t context); ++extern void *drmGetContextTag(int fd, drm_context_t context); ++extern drm_context_t * drmGetReservedContextList(int fd, int *count); ++extern void drmFreeReservedContextList(drm_context_t *); ++extern int drmSwitchToContext(int fd, drm_context_t context); ++extern int drmDestroyContext(int fd, drm_context_t handle); ++extern int drmCreateDrawable(int fd, drm_drawable_t * handle); ++extern int drmDestroyDrawable(int fd, drm_drawable_t handle); ++extern int drmUpdateDrawableInfo(int fd, drm_drawable_t handle, ++ drm_drawable_info_type_t type, ++ unsigned int num, void *data); ++extern int drmCtlInstHandler(int fd, int irq); ++extern int drmCtlUninstHandler(int fd); ++extern int drmSetClientCap(int fd, uint64_t capability, ++ uint64_t value); ++ ++extern int drmCrtcGetSequence(int fd, uint32_t crtcId, ++ uint64_t *sequence, uint64_t *ns); ++extern int drmCrtcQueueSequence(int fd, uint32_t crtcId, ++ uint32_t flags, uint64_t sequence, ++ uint64_t *sequence_queued, ++ uint64_t user_data); ++/* General user-level programmer's API: authenticated client and/or X */ ++extern int drmMap(int fd, ++ drm_handle_t handle, ++ drmSize size, ++ drmAddressPtr address); ++extern int drmUnmap(drmAddress address, drmSize size); ++extern drmBufInfoPtr drmGetBufInfo(int fd); ++extern drmBufMapPtr drmMapBufs(int fd); ++extern int drmUnmapBufs(drmBufMapPtr bufs); ++extern int drmDMA(int fd, drmDMAReqPtr request); ++extern int drmFreeBufs(int fd, int count, int *list); ++extern int drmGetLock(int fd, ++ drm_context_t context, ++ drmLockFlags flags); ++extern int drmUnlock(int fd, drm_context_t context); ++extern int drmFinish(int fd, int context, drmLockFlags flags); ++extern int drmGetContextPrivateMapping(int fd, drm_context_t ctx_id, ++ drm_handle_t * handle); ++ ++/* AGP/GART support: X server (root) only */ ++extern int drmAgpAcquire(int fd); ++extern int drmAgpRelease(int fd); ++extern int drmAgpEnable(int fd, unsigned long mode); ++extern int drmAgpAlloc(int fd, unsigned long size, ++ unsigned long type, unsigned long *address, ++ drm_handle_t *handle); ++extern int drmAgpFree(int fd, drm_handle_t handle); ++extern int drmAgpBind(int fd, drm_handle_t handle, ++ unsigned long offset); ++extern int drmAgpUnbind(int fd, drm_handle_t handle); ++ ++/* AGP/GART info: authenticated client and/or X */ ++extern int drmAgpVersionMajor(int fd); ++extern int drmAgpVersionMinor(int fd); ++extern unsigned long drmAgpGetMode(int fd); ++extern unsigned long drmAgpBase(int fd); /* Physical location */ ++extern unsigned long drmAgpSize(int fd); /* Bytes */ ++extern unsigned long drmAgpMemoryUsed(int fd); ++extern unsigned long drmAgpMemoryAvail(int fd); ++extern unsigned int drmAgpVendorId(int fd); ++extern unsigned int drmAgpDeviceId(int fd); ++ ++/* PCI scatter/gather support: X server (root) only */ ++extern int drmScatterGatherAlloc(int fd, unsigned long size, ++ drm_handle_t *handle); ++extern int drmScatterGatherFree(int fd, drm_handle_t handle); ++ ++extern int drmWaitVBlank(int fd, drmVBlankPtr vbl); ++ ++/* Support routines */ ++extern void drmSetServerInfo(drmServerInfoPtr info); ++extern int drmError(int err, const char *label); ++extern void *drmMalloc(int size); ++extern void drmFree(void *pt); ++ ++/* Hash table routines */ ++extern void *drmHashCreate(void); ++extern int drmHashDestroy(void *t); ++extern int drmHashLookup(void *t, unsigned long key, void **value); ++extern int drmHashInsert(void *t, unsigned long key, void *value); ++extern int drmHashDelete(void *t, unsigned long key); ++extern int drmHashFirst(void *t, unsigned long *key, void **value); ++extern int drmHashNext(void *t, unsigned long *key, void **value); ++ ++/* PRNG routines */ ++extern void *drmRandomCreate(unsigned long seed); ++extern int drmRandomDestroy(void *state); ++extern unsigned long drmRandom(void *state); ++extern double drmRandomDouble(void *state); ++ ++/* Skip list routines */ ++ ++extern void *drmSLCreate(void); ++extern int drmSLDestroy(void *l); ++extern int drmSLLookup(void *l, unsigned long key, void **value); ++extern int drmSLInsert(void *l, unsigned long key, void *value); ++extern int drmSLDelete(void *l, unsigned long key); ++extern int drmSLNext(void *l, unsigned long *key, void **value); ++extern int drmSLFirst(void *l, unsigned long *key, void **value); ++extern void drmSLDump(void *l); ++extern int drmSLLookupNeighbors(void *l, unsigned long key, ++ unsigned long *prev_key, void **prev_value, ++ unsigned long *next_key, void **next_value); ++ ++extern int drmOpenOnce(void *unused, const char *BusID, int *newlyopened); ++extern int drmOpenOnceWithType(const char *BusID, int *newlyopened, int type); ++extern void drmCloseOnce(int fd); ++extern void drmMsg(const char *format, ...) DRM_PRINTFLIKE(1, 2); ++ ++extern int drmSetMaster(int fd); ++extern int drmDropMaster(int fd); ++extern int drmIsMaster(int fd); ++ ++#define DRM_EVENT_CONTEXT_VERSION 4 ++ ++typedef struct _drmEventContext { ++ ++ /* This struct is versioned so we can add more pointers if we ++ * add more events. */ ++ int version; ++ ++ void (*vblank_handler)(int fd, ++ unsigned int sequence, ++ unsigned int tv_sec, ++ unsigned int tv_usec, ++ void *user_data); ++ ++ void (*page_flip_handler)(int fd, ++ unsigned int sequence, ++ unsigned int tv_sec, ++ unsigned int tv_usec, ++ void *user_data); ++ ++ void (*page_flip_handler2)(int fd, ++ unsigned int sequence, ++ unsigned int tv_sec, ++ unsigned int tv_usec, ++ unsigned int crtc_id, ++ void *user_data); ++ ++ void (*sequence_handler)(int fd, ++ uint64_t sequence, ++ uint64_t ns, ++ uint64_t user_data); ++} drmEventContext, *drmEventContextPtr; ++ ++extern int drmHandleEvent(int fd, drmEventContextPtr evctx); ++ ++extern char *drmGetDeviceNameFromFd(int fd); ++ ++/* Improved version of drmGetDeviceNameFromFd which attributes for any type of ++ * device/node - card, control or renderD. ++ */ ++extern char *drmGetDeviceNameFromFd2(int fd); ++extern int drmGetNodeTypeFromFd(int fd); ++ ++/* Convert between GEM handles and DMA-BUF file descriptors. ++ * ++ * Warning: since GEM handles are not reference-counted and are unique per ++ * DRM file description, the caller is expected to perform its own reference ++ * counting. drmPrimeFDToHandle is guaranteed to return the same handle for ++ * different FDs if they reference the same underlying buffer object. This ++ * could even be a buffer object originally created on the same DRM FD. ++ * ++ * When sharing a DRM FD with an API such as EGL or GBM, the caller must not ++ * use drmPrimeHandleToFD nor drmPrimeFDToHandle. A single user-space ++ * reference-counting implementation is necessary to avoid double-closing GEM ++ * handles. ++ * ++ * Two processes can't share the same DRM FD and both use it to create or ++ * import GEM handles, even when using a single user-space reference-counting ++ * implementation like GBM, because GBM doesn't share its state between ++ * processes. ++ */ ++extern int drmPrimeHandleToFD(int fd, uint32_t handle, uint32_t flags, int *prime_fd); ++extern int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle); ++ ++extern int drmCloseBufferHandle(int fd, uint32_t handle); ++ ++extern char *drmGetPrimaryDeviceNameFromFd(int fd); ++extern char *drmGetRenderDeviceNameFromFd(int fd); ++ ++#define DRM_BUS_PCI 0 ++#define DRM_BUS_USB 1 ++#define DRM_BUS_PLATFORM 2 ++#define DRM_BUS_HOST1X 3 ++ ++typedef struct _drmPciBusInfo { ++ uint16_t domain; ++ uint8_t bus; ++ uint8_t dev; ++ uint8_t func; ++} drmPciBusInfo, *drmPciBusInfoPtr; ++ ++typedef struct _drmPciDeviceInfo { ++ uint16_t vendor_id; ++ uint16_t device_id; ++ uint16_t subvendor_id; ++ uint16_t subdevice_id; ++ uint8_t revision_id; ++} drmPciDeviceInfo, *drmPciDeviceInfoPtr; ++ ++typedef struct _drmUsbBusInfo { ++ uint8_t bus; ++ uint8_t dev; ++} drmUsbBusInfo, *drmUsbBusInfoPtr; ++ ++typedef struct _drmUsbDeviceInfo { ++ uint16_t vendor; ++ uint16_t product; ++} drmUsbDeviceInfo, *drmUsbDeviceInfoPtr; ++ ++#define DRM_PLATFORM_DEVICE_NAME_LEN 512 ++ ++typedef struct _drmPlatformBusInfo { ++ char fullname[DRM_PLATFORM_DEVICE_NAME_LEN]; ++} drmPlatformBusInfo, *drmPlatformBusInfoPtr; ++ ++typedef struct _drmPlatformDeviceInfo { ++ char **compatible; /* NULL terminated list of compatible strings */ ++} drmPlatformDeviceInfo, *drmPlatformDeviceInfoPtr; ++ ++#define DRM_HOST1X_DEVICE_NAME_LEN 512 ++ ++typedef struct _drmHost1xBusInfo { ++ char fullname[DRM_HOST1X_DEVICE_NAME_LEN]; ++} drmHost1xBusInfo, *drmHost1xBusInfoPtr; ++ ++typedef struct _drmHost1xDeviceInfo { ++ char **compatible; /* NULL terminated list of compatible strings */ ++} drmHost1xDeviceInfo, *drmHost1xDeviceInfoPtr; ++ ++typedef struct _drmDevice { ++ char **nodes; /* DRM_NODE_MAX sized array */ ++ int available_nodes; /* DRM_NODE_* bitmask */ ++ int bustype; ++ union { ++ drmPciBusInfoPtr pci; ++ drmUsbBusInfoPtr usb; ++ drmPlatformBusInfoPtr platform; ++ drmHost1xBusInfoPtr host1x; ++ } businfo; ++ union { ++ drmPciDeviceInfoPtr pci; ++ drmUsbDeviceInfoPtr usb; ++ drmPlatformDeviceInfoPtr platform; ++ drmHost1xDeviceInfoPtr host1x; ++ } deviceinfo; ++} drmDevice, *drmDevicePtr; ++ ++extern int drmGetDevice(int fd, drmDevicePtr *device); ++extern void drmFreeDevice(drmDevicePtr *device); ++ ++extern int drmGetDevices(drmDevicePtr devices[], int max_devices); ++extern void drmFreeDevices(drmDevicePtr devices[], int count); ++ ++#define DRM_DEVICE_GET_PCI_REVISION (1 << 0) ++extern int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device); ++extern int drmGetDevices2(uint32_t flags, drmDevicePtr devices[], int max_devices); ++ ++extern int drmGetDeviceFromDevId(dev_t dev_id, uint32_t flags, drmDevicePtr *device); ++ ++extern int drmDevicesEqual(drmDevicePtr a, drmDevicePtr b); ++ ++extern int drmSyncobjCreate(int fd, uint32_t flags, uint32_t *handle); ++extern int drmSyncobjDestroy(int fd, uint32_t handle); ++extern int drmSyncobjHandleToFD(int fd, uint32_t handle, int *obj_fd); ++extern int drmSyncobjFDToHandle(int fd, int obj_fd, uint32_t *handle); ++ ++extern int drmSyncobjImportSyncFile(int fd, uint32_t handle, int sync_file_fd); ++extern int drmSyncobjExportSyncFile(int fd, uint32_t handle, int *sync_file_fd); ++extern int drmSyncobjWait(int fd, uint32_t *handles, unsigned num_handles, ++ int64_t timeout_nsec, unsigned flags, ++ uint32_t *first_signaled); ++extern int drmSyncobjReset(int fd, const uint32_t *handles, uint32_t handle_count); ++extern int drmSyncobjSignal(int fd, const uint32_t *handles, uint32_t handle_count); ++extern int drmSyncobjTimelineSignal(int fd, const uint32_t *handles, ++ uint64_t *points, uint32_t handle_count); ++extern int drmSyncobjTimelineWait(int fd, uint32_t *handles, uint64_t *points, ++ unsigned num_handles, ++ int64_t timeout_nsec, unsigned flags, ++ uint32_t *first_signaled); ++extern int drmSyncobjQuery(int fd, uint32_t *handles, uint64_t *points, ++ uint32_t handle_count); ++extern int drmSyncobjQuery2(int fd, uint32_t *handles, uint64_t *points, ++ uint32_t handle_count, uint32_t flags); ++extern int drmSyncobjTransfer(int fd, ++ uint32_t dst_handle, uint64_t dst_point, ++ uint32_t src_handle, uint64_t src_point, ++ uint32_t flags); ++ ++extern char * ++drmGetFormatModifierVendor(uint64_t modifier); ++ ++extern char * ++drmGetFormatModifierName(uint64_t modifier); ++ ++#ifndef fourcc_mod_get_vendor ++#define fourcc_mod_get_vendor(modifier) \ ++ (((modifier) >> 56) & 0xff) ++#endif ++ ++#if defined(__cplusplus) ++} ++#endif ++ ++#endif +diff --git a/third_party/pipewire/libpipewire/moz.build b/third_party/drm/libdrm/moz.build +similarity index 86% +copy from third_party/pipewire/libpipewire/moz.build +copy to third_party/drm/libdrm/moz.build +index 3102b3cb69b7..3b37b913e8b2 100644 +--- a/third_party/pipewire/libpipewire/moz.build ++++ b/third_party/drm/libdrm/moz.build +@@ -5,12 +5,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ +- 'mozpipewire.cpp', ++ 'mozdrm.cpp', + ] + + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] + +-LOCAL_INCLUDES += ['/third_party/pipewire'] ++LOCAL_INCLUDES += ['/third_party/drm'] + + FINAL_LIBRARY = 'xul' +diff --git a/third_party/drm/libdrm/mozdrm.cpp b/third_party/drm/libdrm/mozdrm.cpp +new file mode 100644 +index 000000000000..b2fb59be64a2 +--- /dev/null ++++ b/third_party/drm/libdrm/mozdrm.cpp +@@ -0,0 +1,66 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim:expandtab:shiftwidth=4:tabstop=4: ++ */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "mozilla/Types.h" ++#include "prlink.h" ++ ++#include ++ ++#define GET_FUNC(func, lib) \ ++ func##_fn = \ ++ (decltype(func##_fn))PR_FindFunctionSymbol(lib, #func) \ ++ ++#define IS_FUNC_LOADED(func) \ ++ (func != nullptr) \ ++ ++static int (*drmGetDevices2_fn)(uint32_t flags, drmDevicePtr devices[], int max_devices); ++static void (*drmFreeDevices_fn)(drmDevicePtr devices[], int count); ++ ++bool IsDRMLibraryLoaded() { ++ static bool isLoaded = ++ (IS_FUNC_LOADED(drmGetDevices2_fn) && ++ IS_FUNC_LOADED(drmFreeDevices_fn)); ++ ++ return isLoaded; ++} ++ ++bool LoadDRMLibrary() { ++ static PRLibrary* drmLib = nullptr; ++ static bool drmInitialized = false; ++ ++ //TODO Thread safe ++ if (!drmInitialized) { ++ drmInitialized = true; ++ drmLib = PR_LoadLibrary("libdrm.so.2"); ++ if (!drmLib) { ++ return false; ++ } ++ ++ GET_FUNC(drmGetDevices2, drmLib); ++ GET_FUNC(drmFreeDevices, drmLib); ++ } ++ ++ return IsDRMLibraryLoaded(); ++} ++ ++int ++drmGetDevices2(uint32_t flags, drmDevicePtr devices[], int max_devices) ++{ ++ if (!LoadDRMLibrary()) { ++ return 0; ++ } ++ return drmGetDevices2_fn(flags, devices, max_devices); ++} ++ ++void ++drmFreeDevices(drmDevicePtr devices[], int count) ++{ ++ if (!LoadDRMLibrary()) { ++ return; ++ } ++ return drmFreeDevices_fn(devices, count); ++} +diff --git a/third_party/gbm/README b/third_party/gbm/README +new file mode 100644 +index 000000000000..4b6e2e8e02b2 +--- /dev/null ++++ b/third_party/gbm/README +@@ -0,0 +1,4 @@ ++Libgbm is a gbm library wrapper needed to build and run Firefox with ++Pipewire support on Linux (https://gitlab.freedesktop.org/mesa/gbm). ++ ++libgbm directory stores headers of libgbm needed for build only. +diff --git a/third_party/gbm/gbm/gbm.h b/third_party/gbm/gbm/gbm.h +new file mode 100644 +index 000000000000..e28fa04aaed8 +--- /dev/null ++++ b/third_party/gbm/gbm/gbm.h +@@ -0,0 +1,452 @@ ++/* ++ * Copyright © 2011 Intel Corporation ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ * ++ * Authors: ++ * Benjamin Franzke ++ */ ++ ++#ifndef _GBM_H_ ++#define _GBM_H_ ++ ++#define __GBM__ 1 ++ ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++ ++/** ++ * \file gbm.h ++ * \brief Generic Buffer Manager ++ */ ++ ++struct gbm_device; ++struct gbm_bo; ++struct gbm_surface; ++ ++/** ++ * \mainpage The Generic Buffer Manager ++ * ++ * This module provides an abstraction that the caller can use to request a ++ * buffer from the underlying memory management system for the platform. ++ * ++ * This allows the creation of portable code whilst still allowing access to ++ * the underlying memory manager. ++ */ ++ ++/** ++ * Abstraction representing the handle to a buffer allocated by the ++ * manager ++ */ ++union gbm_bo_handle { ++ void *ptr; ++ int32_t s32; ++ uint32_t u32; ++ int64_t s64; ++ uint64_t u64; ++}; ++ ++/** Format of the allocated buffer */ ++enum gbm_bo_format { ++ /** RGB with 8 bits per channel in a 32 bit value */ ++ GBM_BO_FORMAT_XRGB8888, ++ /** ARGB with 8 bits per channel in a 32 bit value */ ++ GBM_BO_FORMAT_ARGB8888 ++}; ++ ++ ++/** ++ * The FourCC format codes are taken from the drm_fourcc.h definition, and ++ * re-namespaced. New GBM formats must not be added, unless they are ++ * identical ports from drm_fourcc. ++ */ ++#define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \ ++ ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24)) ++ ++#define GBM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ ++ ++/* color index */ ++#define GBM_FORMAT_C8 __gbm_fourcc_code('C', '8', ' ', ' ') /* [7:0] C */ ++ ++/* 8 bpp Red */ ++#define GBM_FORMAT_R8 __gbm_fourcc_code('R', '8', ' ', ' ') /* [7:0] R */ ++ ++/* 16 bpp Red */ ++#define GBM_FORMAT_R16 __gbm_fourcc_code('R', '1', '6', ' ') /* [15:0] R little endian */ ++ ++/* 16 bpp RG */ ++#define GBM_FORMAT_GR88 __gbm_fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */ ++ ++/* 8 bpp RGB */ ++#define GBM_FORMAT_RGB332 __gbm_fourcc_code('R', 'G', 'B', '8') /* [7:0] R:G:B 3:3:2 */ ++#define GBM_FORMAT_BGR233 __gbm_fourcc_code('B', 'G', 'R', '8') /* [7:0] B:G:R 2:3:3 */ ++ ++/* 16 bpp RGB */ ++#define GBM_FORMAT_XRGB4444 __gbm_fourcc_code('X', 'R', '1', '2') /* [15:0] x:R:G:B 4:4:4:4 little endian */ ++#define GBM_FORMAT_XBGR4444 __gbm_fourcc_code('X', 'B', '1', '2') /* [15:0] x:B:G:R 4:4:4:4 little endian */ ++#define GBM_FORMAT_RGBX4444 __gbm_fourcc_code('R', 'X', '1', '2') /* [15:0] R:G:B:x 4:4:4:4 little endian */ ++#define GBM_FORMAT_BGRX4444 __gbm_fourcc_code('B', 'X', '1', '2') /* [15:0] B:G:R:x 4:4:4:4 little endian */ ++ ++#define GBM_FORMAT_ARGB4444 __gbm_fourcc_code('A', 'R', '1', '2') /* [15:0] A:R:G:B 4:4:4:4 little endian */ ++#define GBM_FORMAT_ABGR4444 __gbm_fourcc_code('A', 'B', '1', '2') /* [15:0] A:B:G:R 4:4:4:4 little endian */ ++#define GBM_FORMAT_RGBA4444 __gbm_fourcc_code('R', 'A', '1', '2') /* [15:0] R:G:B:A 4:4:4:4 little endian */ ++#define GBM_FORMAT_BGRA4444 __gbm_fourcc_code('B', 'A', '1', '2') /* [15:0] B:G:R:A 4:4:4:4 little endian */ ++ ++#define GBM_FORMAT_XRGB1555 __gbm_fourcc_code('X', 'R', '1', '5') /* [15:0] x:R:G:B 1:5:5:5 little endian */ ++#define GBM_FORMAT_XBGR1555 __gbm_fourcc_code('X', 'B', '1', '5') /* [15:0] x:B:G:R 1:5:5:5 little endian */ ++#define GBM_FORMAT_RGBX5551 __gbm_fourcc_code('R', 'X', '1', '5') /* [15:0] R:G:B:x 5:5:5:1 little endian */ ++#define GBM_FORMAT_BGRX5551 __gbm_fourcc_code('B', 'X', '1', '5') /* [15:0] B:G:R:x 5:5:5:1 little endian */ ++ ++#define GBM_FORMAT_ARGB1555 __gbm_fourcc_code('A', 'R', '1', '5') /* [15:0] A:R:G:B 1:5:5:5 little endian */ ++#define GBM_FORMAT_ABGR1555 __gbm_fourcc_code('A', 'B', '1', '5') /* [15:0] A:B:G:R 1:5:5:5 little endian */ ++#define GBM_FORMAT_RGBA5551 __gbm_fourcc_code('R', 'A', '1', '5') /* [15:0] R:G:B:A 5:5:5:1 little endian */ ++#define GBM_FORMAT_BGRA5551 __gbm_fourcc_code('B', 'A', '1', '5') /* [15:0] B:G:R:A 5:5:5:1 little endian */ ++ ++#define GBM_FORMAT_RGB565 __gbm_fourcc_code('R', 'G', '1', '6') /* [15:0] R:G:B 5:6:5 little endian */ ++#define GBM_FORMAT_BGR565 __gbm_fourcc_code('B', 'G', '1', '6') /* [15:0] B:G:R 5:6:5 little endian */ ++ ++/* 24 bpp RGB */ ++#define GBM_FORMAT_RGB888 __gbm_fourcc_code('R', 'G', '2', '4') /* [23:0] R:G:B little endian */ ++#define GBM_FORMAT_BGR888 __gbm_fourcc_code('B', 'G', '2', '4') /* [23:0] B:G:R little endian */ ++ ++/* 32 bpp RGB */ ++#define GBM_FORMAT_XRGB8888 __gbm_fourcc_code('X', 'R', '2', '4') /* [31:0] x:R:G:B 8:8:8:8 little endian */ ++#define GBM_FORMAT_XBGR8888 __gbm_fourcc_code('X', 'B', '2', '4') /* [31:0] x:B:G:R 8:8:8:8 little endian */ ++#define GBM_FORMAT_RGBX8888 __gbm_fourcc_code('R', 'X', '2', '4') /* [31:0] R:G:B:x 8:8:8:8 little endian */ ++#define GBM_FORMAT_BGRX8888 __gbm_fourcc_code('B', 'X', '2', '4') /* [31:0] B:G:R:x 8:8:8:8 little endian */ ++ ++#define GBM_FORMAT_ARGB8888 __gbm_fourcc_code('A', 'R', '2', '4') /* [31:0] A:R:G:B 8:8:8:8 little endian */ ++#define GBM_FORMAT_ABGR8888 __gbm_fourcc_code('A', 'B', '2', '4') /* [31:0] A:B:G:R 8:8:8:8 little endian */ ++#define GBM_FORMAT_RGBA8888 __gbm_fourcc_code('R', 'A', '2', '4') /* [31:0] R:G:B:A 8:8:8:8 little endian */ ++#define GBM_FORMAT_BGRA8888 __gbm_fourcc_code('B', 'A', '2', '4') /* [31:0] B:G:R:A 8:8:8:8 little endian */ ++ ++#define GBM_FORMAT_XRGB2101010 __gbm_fourcc_code('X', 'R', '3', '0') /* [31:0] x:R:G:B 2:10:10:10 little endian */ ++#define GBM_FORMAT_XBGR2101010 __gbm_fourcc_code('X', 'B', '3', '0') /* [31:0] x:B:G:R 2:10:10:10 little endian */ ++#define GBM_FORMAT_RGBX1010102 __gbm_fourcc_code('R', 'X', '3', '0') /* [31:0] R:G:B:x 10:10:10:2 little endian */ ++#define GBM_FORMAT_BGRX1010102 __gbm_fourcc_code('B', 'X', '3', '0') /* [31:0] B:G:R:x 10:10:10:2 little endian */ ++ ++#define GBM_FORMAT_ARGB2101010 __gbm_fourcc_code('A', 'R', '3', '0') /* [31:0] A:R:G:B 2:10:10:10 little endian */ ++#define GBM_FORMAT_ABGR2101010 __gbm_fourcc_code('A', 'B', '3', '0') /* [31:0] A:B:G:R 2:10:10:10 little endian */ ++#define GBM_FORMAT_RGBA1010102 __gbm_fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */ ++#define GBM_FORMAT_BGRA1010102 __gbm_fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */ ++ ++/* ++ * Floating point 64bpp RGB ++ * IEEE 754-2008 binary16 half-precision float ++ * [15:0] sign:exponent:mantissa 1:5:10 ++ */ ++#define GBM_FORMAT_XBGR16161616F __gbm_fourcc_code('X', 'B', '4', 'H') /* [63:0] x:B:G:R 16:16:16:16 little endian */ ++ ++#define GBM_FORMAT_ABGR16161616F __gbm_fourcc_code('A', 'B', '4', 'H') /* [63:0] A:B:G:R 16:16:16:16 little endian */ ++ ++/* packed YCbCr */ ++#define GBM_FORMAT_YUYV __gbm_fourcc_code('Y', 'U', 'Y', 'V') /* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ ++#define GBM_FORMAT_YVYU __gbm_fourcc_code('Y', 'V', 'Y', 'U') /* [31:0] Cb0:Y1:Cr0:Y0 8:8:8:8 little endian */ ++#define GBM_FORMAT_UYVY __gbm_fourcc_code('U', 'Y', 'V', 'Y') /* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ ++#define GBM_FORMAT_VYUY __gbm_fourcc_code('V', 'Y', 'U', 'Y') /* [31:0] Y1:Cb0:Y0:Cr0 8:8:8:8 little endian */ ++ ++#define GBM_FORMAT_AYUV __gbm_fourcc_code('A', 'Y', 'U', 'V') /* [31:0] A:Y:Cb:Cr 8:8:8:8 little endian */ ++ ++/* ++ * 2 plane YCbCr ++ * index 0 = Y plane, [7:0] Y ++ * index 1 = Cr:Cb plane, [15:0] Cr:Cb little endian ++ * or ++ * index 1 = Cb:Cr plane, [15:0] Cb:Cr little endian ++ */ ++#define GBM_FORMAT_NV12 __gbm_fourcc_code('N', 'V', '1', '2') /* 2x2 subsampled Cr:Cb plane */ ++#define GBM_FORMAT_NV21 __gbm_fourcc_code('N', 'V', '2', '1') /* 2x2 subsampled Cb:Cr plane */ ++#define GBM_FORMAT_NV16 __gbm_fourcc_code('N', 'V', '1', '6') /* 2x1 subsampled Cr:Cb plane */ ++#define GBM_FORMAT_NV61 __gbm_fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */ ++ ++/* ++ * 3 plane YCbCr ++ * index 0: Y plane, [7:0] Y ++ * index 1: Cb plane, [7:0] Cb ++ * index 2: Cr plane, [7:0] Cr ++ * or ++ * index 1: Cr plane, [7:0] Cr ++ * index 2: Cb plane, [7:0] Cb ++ */ ++#define GBM_FORMAT_YUV410 __gbm_fourcc_code('Y', 'U', 'V', '9') /* 4x4 subsampled Cb (1) and Cr (2) planes */ ++#define GBM_FORMAT_YVU410 __gbm_fourcc_code('Y', 'V', 'U', '9') /* 4x4 subsampled Cr (1) and Cb (2) planes */ ++#define GBM_FORMAT_YUV411 __gbm_fourcc_code('Y', 'U', '1', '1') /* 4x1 subsampled Cb (1) and Cr (2) planes */ ++#define GBM_FORMAT_YVU411 __gbm_fourcc_code('Y', 'V', '1', '1') /* 4x1 subsampled Cr (1) and Cb (2) planes */ ++#define GBM_FORMAT_YUV420 __gbm_fourcc_code('Y', 'U', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes */ ++#define GBM_FORMAT_YVU420 __gbm_fourcc_code('Y', 'V', '1', '2') /* 2x2 subsampled Cr (1) and Cb (2) planes */ ++#define GBM_FORMAT_YUV422 __gbm_fourcc_code('Y', 'U', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes */ ++#define GBM_FORMAT_YVU422 __gbm_fourcc_code('Y', 'V', '1', '6') /* 2x1 subsampled Cr (1) and Cb (2) planes */ ++#define GBM_FORMAT_YUV444 __gbm_fourcc_code('Y', 'U', '2', '4') /* non-subsampled Cb (1) and Cr (2) planes */ ++#define GBM_FORMAT_YVU444 __gbm_fourcc_code('Y', 'V', '2', '4') /* non-subsampled Cr (1) and Cb (2) planes */ ++ ++struct gbm_format_name_desc { ++ char name[5]; ++}; ++ ++/** ++ * Flags to indicate the intended use for the buffer - these are passed into ++ * gbm_bo_create(). The caller must set the union of all the flags that are ++ * appropriate ++ * ++ * \sa Use gbm_device_is_format_supported() to check if the combination of format ++ * and use flags are supported ++ */ ++enum gbm_bo_flags { ++ /** ++ * Buffer is going to be presented to the screen using an API such as KMS ++ */ ++ GBM_BO_USE_SCANOUT = (1 << 0), ++ /** ++ * Buffer is going to be used as cursor ++ */ ++ GBM_BO_USE_CURSOR = (1 << 1), ++ /** ++ * Deprecated ++ */ ++ GBM_BO_USE_CURSOR_64X64 = GBM_BO_USE_CURSOR, ++ /** ++ * Buffer is to be used for rendering - for example it is going to be used ++ * as the storage for a color buffer ++ */ ++ GBM_BO_USE_RENDERING = (1 << 2), ++ /** ++ * Buffer can be used for gbm_bo_write. This is guaranteed to work ++ * with GBM_BO_USE_CURSOR, but may not work for other combinations. ++ */ ++ GBM_BO_USE_WRITE = (1 << 3), ++ /** ++ * Buffer is linear, i.e. not tiled. ++ */ ++ GBM_BO_USE_LINEAR = (1 << 4), ++ /** ++ * Buffer is protected, i.e. encrypted and not readable by CPU or any ++ * other non-secure / non-trusted components nor by non-trusted OpenGL, ++ * OpenCL, and Vulkan applications. ++ */ ++ GBM_BO_USE_PROTECTED = (1 << 5), ++}; ++ ++int ++gbm_device_get_fd(struct gbm_device *gbm); ++ ++const char * ++gbm_device_get_backend_name(struct gbm_device *gbm); ++ ++int ++gbm_device_is_format_supported(struct gbm_device *gbm, ++ uint32_t format, uint32_t flags); ++ ++int ++gbm_device_get_format_modifier_plane_count(struct gbm_device *gbm, ++ uint32_t format, ++ uint64_t modifier); ++ ++void ++gbm_device_destroy(struct gbm_device *gbm); ++ ++struct gbm_device * ++gbm_create_device(int fd); ++ ++struct gbm_bo * ++gbm_bo_create(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, uint32_t flags); ++ ++struct gbm_bo * ++gbm_bo_create_with_modifiers(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, ++ const uint64_t *modifiers, ++ const unsigned int count); ++ ++struct gbm_bo * ++gbm_bo_create_with_modifiers2(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, ++ const uint64_t *modifiers, ++ const unsigned int count, ++ uint32_t flags); ++ ++#define GBM_BO_IMPORT_WL_BUFFER 0x5501 ++#define GBM_BO_IMPORT_EGL_IMAGE 0x5502 ++#define GBM_BO_IMPORT_FD 0x5503 ++#define GBM_BO_IMPORT_FD_MODIFIER 0x5504 ++ ++struct gbm_import_fd_data { ++ int fd; ++ uint32_t width; ++ uint32_t height; ++ uint32_t stride; ++ uint32_t format; ++}; ++ ++#define GBM_MAX_PLANES 4 ++ ++struct gbm_import_fd_modifier_data { ++ uint32_t width; ++ uint32_t height; ++ uint32_t format; ++ uint32_t num_fds; ++ int fds[GBM_MAX_PLANES]; ++ int strides[GBM_MAX_PLANES]; ++ int offsets[GBM_MAX_PLANES]; ++ uint64_t modifier; ++}; ++ ++struct gbm_bo * ++gbm_bo_import(struct gbm_device *gbm, uint32_t type, ++ void *buffer, uint32_t flags); ++ ++/** ++ * Flags to indicate the type of mapping for the buffer - these are ++ * passed into gbm_bo_map(). The caller must set the union of all the ++ * flags that are appropriate. ++ * ++ * These flags are independent of the GBM_BO_USE_* creation flags. However, ++ * mapping the buffer may require copying to/from a staging buffer. ++ * ++ * See also: pipe_map_flags ++ */ ++enum gbm_bo_transfer_flags { ++ /** ++ * Buffer contents read back (or accessed directly) at transfer ++ * create time. ++ */ ++ GBM_BO_TRANSFER_READ = (1 << 0), ++ /** ++ * Buffer contents will be written back at unmap time ++ * (or modified as a result of being accessed directly). ++ */ ++ GBM_BO_TRANSFER_WRITE = (1 << 1), ++ /** ++ * Read/modify/write ++ */ ++ GBM_BO_TRANSFER_READ_WRITE = (GBM_BO_TRANSFER_READ | GBM_BO_TRANSFER_WRITE), ++}; ++ ++void * ++gbm_bo_map(struct gbm_bo *bo, ++ uint32_t x, uint32_t y, uint32_t width, uint32_t height, ++ uint32_t flags, uint32_t *stride, void **map_data); ++ ++void ++gbm_bo_unmap(struct gbm_bo *bo, void *map_data); ++ ++uint32_t ++gbm_bo_get_width(struct gbm_bo *bo); ++ ++uint32_t ++gbm_bo_get_height(struct gbm_bo *bo); ++ ++uint32_t ++gbm_bo_get_stride(struct gbm_bo *bo); ++ ++uint32_t ++gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane); ++ ++uint32_t ++gbm_bo_get_format(struct gbm_bo *bo); ++ ++uint32_t ++gbm_bo_get_bpp(struct gbm_bo *bo); ++ ++uint32_t ++gbm_bo_get_offset(struct gbm_bo *bo, int plane); ++ ++struct gbm_device * ++gbm_bo_get_device(struct gbm_bo *bo); ++ ++union gbm_bo_handle ++gbm_bo_get_handle(struct gbm_bo *bo); ++ ++int ++gbm_bo_get_fd(struct gbm_bo *bo); ++ ++uint64_t ++gbm_bo_get_modifier(struct gbm_bo *bo); ++ ++int ++gbm_bo_get_plane_count(struct gbm_bo *bo); ++ ++union gbm_bo_handle ++gbm_bo_get_handle_for_plane(struct gbm_bo *bo, int plane); ++ ++int ++gbm_bo_get_fd_for_plane(struct gbm_bo *bo, int plane); ++ ++int ++gbm_bo_write(struct gbm_bo *bo, const void *buf, size_t count); ++ ++void ++gbm_bo_set_user_data(struct gbm_bo *bo, void *data, ++ void (*destroy_user_data)(struct gbm_bo *, void *)); ++ ++void * ++gbm_bo_get_user_data(struct gbm_bo *bo); ++ ++void ++gbm_bo_destroy(struct gbm_bo *bo); ++ ++struct gbm_surface * ++gbm_surface_create(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, uint32_t flags); ++ ++struct gbm_surface * ++gbm_surface_create_with_modifiers(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, ++ const uint64_t *modifiers, ++ const unsigned int count); ++ ++struct gbm_surface * ++gbm_surface_create_with_modifiers2(struct gbm_device *gbm, ++ uint32_t width, uint32_t height, ++ uint32_t format, ++ const uint64_t *modifiers, ++ const unsigned int count, ++ uint32_t flags); ++ ++struct gbm_bo * ++gbm_surface_lock_front_buffer(struct gbm_surface *surface); ++ ++void ++gbm_surface_release_buffer(struct gbm_surface *surface, struct gbm_bo *bo); ++ ++int ++gbm_surface_has_free_buffers(struct gbm_surface *surface); ++ ++void ++gbm_surface_destroy(struct gbm_surface *surface); ++ ++char * ++gbm_format_get_name(uint32_t gbm_format, struct gbm_format_name_desc *desc); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/third_party/pipewire/libpipewire/moz.build b/third_party/gbm/libgbm/moz.build +similarity index 86% +copy from third_party/pipewire/libpipewire/moz.build +copy to third_party/gbm/libgbm/moz.build +index 3102b3cb69b7..0953d2f17a54 100644 +--- a/third_party/pipewire/libpipewire/moz.build ++++ b/third_party/gbm/libgbm/moz.build +@@ -5,12 +5,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ +- 'mozpipewire.cpp', ++ 'mozgbm.cpp', + ] + + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] + +-LOCAL_INCLUDES += ['/third_party/pipewire'] ++LOCAL_INCLUDES += ['/third_party/gbm'] + + FINAL_LIBRARY = 'xul' +diff --git a/third_party/gbm/libgbm/mozgbm.cpp b/third_party/gbm/libgbm/mozgbm.cpp +new file mode 100644 +index 000000000000..bc024a11c0b7 +--- /dev/null ++++ b/third_party/gbm/libgbm/mozgbm.cpp +@@ -0,0 +1,66 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ ++/* vim:expandtab:shiftwidth=4:tabstop=4: ++ */ ++/* This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++#include "mozilla/Types.h" ++#include "prlink.h" ++ ++#include ++ ++#define GET_FUNC(func, lib) \ ++ func##_fn = \ ++ (decltype(func##_fn))PR_FindFunctionSymbol(lib, #func) \ ++ ++#define IS_FUNC_LOADED(func) \ ++ (func != nullptr) \ ++ ++static struct gbm_device * (*gbm_create_device_fn)(int fd); ++static void (*gbm_device_destroy_fn)(struct gbm_device* gbm); ++ ++bool IsGBMLibraryLoaded() { ++ static bool isLoaded = ++ (IS_FUNC_LOADED(gbm_create_device_fn) && ++ IS_FUNC_LOADED(gbm_device_destroy_fn)); ++ ++ return isLoaded; ++} ++ ++bool LoadGBMLibrary() { ++ static PRLibrary* gbmLib = nullptr; ++ static bool gbmInitialized = false; ++ ++ //TODO Thread safe ++ if (!gbmInitialized) { ++ gbmInitialized = true; ++ gbmLib = PR_LoadLibrary("libgbm.so.1"); ++ if (!gbmLib) { ++ return false; ++ } ++ ++ GET_FUNC(gbm_create_device, gbmLib); ++ GET_FUNC(gbm_device_destroy, gbmLib); ++ } ++ ++ return IsGBMLibraryLoaded(); ++} ++ ++struct gbm_device * ++gbm_create_device(int fd) ++{ ++ if (!LoadGBMLibrary()) { ++ return nullptr; ++ } ++ return gbm_create_device_fn(fd); ++} ++ ++void ++gbm_device_destroy(struct gbm_device* gbm) ++{ ++ if (!LoadGBMLibrary()) { ++ return; ++ } ++ return gbm_device_destroy_fn(gbm); ++} +diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build +index 809899a92847..8869fae89703 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build ++++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build +@@ -8,25 +8,28 @@ + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + +-COMPILE_FLAGS["OS_INCLUDES"] = [] ++# FIXME: No idea why it doesn't pick libdrm from /third_party/drm ++COMPILE_FLAGS["OS_INCLUDES"] = [ "-I/usr/include/libdrm" ] + AllowCompilerWarnings() + + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True + DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" + DEFINES["WEBRTC_LIBRARY_IMPL"] = True + DEFINES["WEBRTC_MOZILLA_BUILD"] = True + DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" + + FINAL_LIBRARY = "webrtc" + + + LOCAL_INCLUDES += [ + "!/ipc/ipdl/_ipdlheaders", + "/ipc/chromium/src", + "/media/libyuv/", + "/media/libyuv/libyuv/include/", ++ "/third_party/drm/", ++ "/third_party/gbm/", + "/third_party/libwebrtc/", + "/third_party/libwebrtc/third_party/abseil-cpp/", + "/third_party/pipewire/", +@@ -240,7 +243,15 @@ if CONFIG["CPU_ARCH"] == "arm": + DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc" + ] + + if CONFIG["CPU_ARCH"] == "ppc64": +@@ -295,27 +306,51 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": + DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc" + ] + + if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc" + ] + + if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": + + DEFINES["WEBRTC_ENABLE_AVX2"] = True + DEFINES["WEBRTC_USE_PIPEWIRE"] = True + DEFINES["_GNU_SOURCE"] = True + + UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.cc" ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/egl_dmabuf.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/mouse_cursor_monitor_pipewire.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/scoped_glib.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc", ++ "/third_party/libwebrtc/modules/desktop_capture/linux/wayland/xdg_desktop_portal_utils.cc" + ] + + if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": +diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc +index 8bdc83b76218..ab7932195c85 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc ++++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.cc +@@ -14,33 +14,33 @@ + #elif defined(WEBRTC_WIN) + #include "modules/desktop_capture/win/full_screen_win_application_handler.h" + #endif +-#if defined(WEBRTC_USE_PIPEWIRE) && !defined(WEBRTC_MOZILLA_BUILD) ++#if defined(WEBRTC_USE_PIPEWIRE) + #include "modules/desktop_capture/linux/wayland/shared_screencast_stream.h" + #endif + + #include "rtc_base/ref_counted_object.h" + + namespace webrtc { + + DesktopCaptureOptions::DesktopCaptureOptions() {} + DesktopCaptureOptions::DesktopCaptureOptions( + const DesktopCaptureOptions& options) = default; + DesktopCaptureOptions::DesktopCaptureOptions(DesktopCaptureOptions&& options) = + default; + DesktopCaptureOptions::~DesktopCaptureOptions() {} + + DesktopCaptureOptions& DesktopCaptureOptions::operator=( + const DesktopCaptureOptions& options) = default; + DesktopCaptureOptions& DesktopCaptureOptions::operator=( + DesktopCaptureOptions&& options) = default; + + // static + DesktopCaptureOptions DesktopCaptureOptions::CreateDefault() { + DesktopCaptureOptions result; + #if defined(WEBRTC_USE_X11) + result.set_x_display(SharedXDisplay::CreateDefault()); + #endif +-#if defined(WEBRTC_USE_PIPEWIRE) && !defined(WEBRTC_MOZILLA_BUILD) ++#if defined(WEBRTC_USE_PIPEWIRE) + result.set_screencast_stream(SharedScreenCastStream::CreateDefault()); + #endif + #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) +diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h +index 1605d30f82d1..eb5b8a2a8777 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h ++++ b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_options.h +@@ -17,7 +17,7 @@ + #include "modules/desktop_capture/linux/x11/shared_x_display.h" + #endif + +-#if defined(WEBRTC_USE_PIPEWIRE) && !defined(WEBRTC_MOZILLA_BUILD) ++#if defined(WEBRTC_USE_PIPEWIRE) + #include "modules/desktop_capture/linux/wayland/shared_screencast_stream.h" + #endif + +@@ -181,22 +181,20 @@ class RTC_EXPORT DesktopCaptureOptions { + bool allow_pipewire() const { return allow_pipewire_; } + void set_allow_pipewire(bool allow) { allow_pipewire_ = allow; } + +-#if !defined(WEBRTC_MOZILLA_BUILD) + const rtc::scoped_refptr& screencast_stream() const { + return screencast_stream_; + } + void set_screencast_stream( + rtc::scoped_refptr stream) { + screencast_stream_ = stream; + } +-#endif + #endif + + private: + #if defined(WEBRTC_USE_X11) + rtc::scoped_refptr x_display_; + #endif +-#if defined(WEBRTC_USE_PIPEWIRE) && !defined(WEBRTC_MOZILLA_BUILD) ++#if defined(WEBRTC_USE_PIPEWIRE) + // An instance of shared PipeWire ScreenCast stream we share between + // BaseCapturerPipeWire and MouseCursorMonitorPipeWire as cursor information + // is sent together with screen content. +diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc +index 75659a9eb9e2..32578411059b 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc ++++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc +@@ -105,7 +105,7 @@ bool BaseCapturerPipeWire::GetSourceList(SourceList* sources) { + // is often treated as a null/placeholder id, so we shouldn't use that. + // TODO(https://crbug.com/1297671): Reconsider type of ID when plumbing + // token that will enable stream re-use. +- sources->push_back({1}); ++ sources->push_back({PIPEWIRE_ID, 0, PIPEWIRE_NAME}); + return true; + } + +diff --git a/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc b/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc +index d9f27951302d..18840cc6d7ef 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc ++++ b/third_party/libwebrtc/modules/desktop_capture/screen_capturer_linux.cc +@@ -14,29 +14,21 @@ + #include "modules/desktop_capture/desktop_capturer.h" + + #if defined(WEBRTC_USE_PIPEWIRE) +-#if defined(WEBRTC_MOZILLA_BUILD) +-#include "modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.h" +-#else + #include "modules/desktop_capture/linux/wayland/base_capturer_pipewire.h" +-#endif + #endif // defined(WEBRTC_USE_PIPEWIRE) + + #if defined(WEBRTC_USE_X11) + #include "modules/desktop_capture/linux/x11/screen_capturer_x11.h" + #endif // defined(WEBRTC_USE_X11) + + namespace webrtc { + + // static + std::unique_ptr DesktopCapturer::CreateRawScreenCapturer( + const DesktopCaptureOptions& options) { + #if defined(WEBRTC_USE_PIPEWIRE) + if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) { +-#if defined(WEBRTC_MOZILLA_BUILD) +- return BaseCapturerPipeWire::CreateRawCapturer(options); +-#else + return std::make_unique(options); +-#endif + } + #endif // defined(WEBRTC_USE_PIPEWIRE) + +diff --git a/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc b/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc +index b2b1e376ada5..638c42ae3963 100644 +--- a/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc ++++ b/third_party/libwebrtc/modules/desktop_capture/window_capturer_linux.cc +@@ -14,29 +14,21 @@ + #include "modules/desktop_capture/desktop_capturer.h" + + #if defined(WEBRTC_USE_PIPEWIRE) +-#if defined(WEBRTC_MOZILLA_BUILD) +-#include "modules/desktop_capture/linux/wayland/moz_base_capturer_pipewire.h" +-#else + #include "modules/desktop_capture/linux/wayland/base_capturer_pipewire.h" +-#endif + #endif // defined(WEBRTC_USE_PIPEWIRE) + + #if defined(WEBRTC_USE_X11) + #include "modules/desktop_capture/linux/x11/window_capturer_x11.h" + #endif // defined(WEBRTC_USE_X11) + + namespace webrtc { + + // static + std::unique_ptr DesktopCapturer::CreateRawWindowCapturer( + const DesktopCaptureOptions& options) { + #if defined(WEBRTC_USE_PIPEWIRE) + if (options.allow_pipewire() && DesktopCapturer::IsRunningUnderWayland()) { +-#if defined(WEBRTC_MOZILLA_BUILD) +- return BaseCapturerPipeWire::CreateRawCapturer(options); +-#else + return std::make_unique(options); +-#endif + } + #endif // defined(WEBRTC_USE_PIPEWIRE) + +diff --git a/third_party/moz.build b/third_party/moz.build +index 19ee0224b041..fab8f23c624f 100644 +--- a/third_party/moz.build ++++ b/third_party/moz.build +@@ -61,6 +61,12 @@ with Files("libwebrtc/**"): + with Files("pipewire/**"): + BUG_COMPONENT = ("Core", "WebRTC") + ++with Files("drm/**"): ++ BUG_COMPONENT = ("Core", "WebRTC") ++ ++with Files("gbm/**"): ++ BUG_COMPONENT = ("Core", "WebRTC") ++ + with Files('rlbox_wasm2c_sandbox/**'): + BUG_COMPONENT = ('Firefox Build System', 'General') + +diff --git a/third_party/pipewire/libpipewire/mozpipewire.cpp b/third_party/pipewire/libpipewire/mozpipewire.cpp +index 1ecfc3196af1..380c5b2c8582 100644 +--- a/third_party/pipewire/libpipewire/mozpipewire.cpp ++++ b/third_party/pipewire/libpipewire/mozpipewire.cpp +@@ -69,86 +69,99 @@ static int (*pw_stream_connect_fn)(struct pw_stream *stream, + enum pw_stream_flags flags, + const struct spa_pod **params, + uint32_t n_params); ++static int (*pw_stream_disconnect_fn)(struct pw_stream *stream); + static struct pw_buffer* (*pw_stream_dequeue_buffer_fn)(struct pw_stream *stream); + static void (*pw_stream_destroy_fn)(struct pw_stream *stream); + static struct pw_stream* (*pw_stream_new_fn)(struct pw_core *core, + const char *name, + struct pw_properties *props); ++ + static int (*pw_stream_queue_buffer_fn)(struct pw_stream *stream, + struct pw_buffer *buffer); + static int (*pw_stream_update_params_fn)(struct pw_stream *stream, + const struct spa_pod **params, + uint32_t n_params); + static void (*pw_thread_loop_destroy_fn)(struct pw_thread_loop *loop); + static struct pw_loop* (*pw_thread_loop_get_loop_fn)(struct pw_thread_loop *loop); + static struct pw_thread_loop* (*pw_thread_loop_new_fn)(const char *name, + const struct spa_dict *props); + static int (*pw_thread_loop_start_fn)(struct pw_thread_loop *loop); + static void (*pw_thread_loop_stop_fn)(struct pw_thread_loop *loop); + static void (*pw_thread_loop_lock_fn)(struct pw_thread_loop *loop); + static void (*pw_thread_loop_unlock_fn)(struct pw_thread_loop *loop); ++static void (*pw_thread_loop_wait_fn)(struct pw_thread_loop *loop); ++static void (*pw_thread_loop_signal_fn)(struct pw_thread_loop *loop, bool wait_for_accept); + static struct pw_properties* (*pw_properties_new_string_fn)(const char *str); ++static const char* (*pw_get_library_version_fn)(); + + bool IsPwLibraryLoaded() { + static bool isLoaded = + (IS_FUNC_LOADED(pw_context_connect_fn) && + IS_FUNC_LOADED(pw_context_connect_fd_fn) && + IS_FUNC_LOADED(pw_context_destroy_fn) && + IS_FUNC_LOADED(pw_context_new_fn) && + IS_FUNC_LOADED(pw_core_disconnect_fn) && + IS_FUNC_LOADED(pw_init_fn) && + IS_FUNC_LOADED(pw_stream_add_listener_fn) && + IS_FUNC_LOADED(pw_stream_connect_fn) && ++ IS_FUNC_LOADED(pw_stream_disconnect_fn) && + IS_FUNC_LOADED(pw_stream_dequeue_buffer_fn) && + IS_FUNC_LOADED(pw_stream_destroy_fn) && + IS_FUNC_LOADED(pw_stream_new_fn) && + IS_FUNC_LOADED(pw_stream_queue_buffer_fn) && + IS_FUNC_LOADED(pw_stream_update_params_fn) && + IS_FUNC_LOADED(pw_thread_loop_destroy_fn) && + IS_FUNC_LOADED(pw_thread_loop_get_loop_fn) && + IS_FUNC_LOADED(pw_thread_loop_new_fn) && + IS_FUNC_LOADED(pw_thread_loop_start_fn) && + IS_FUNC_LOADED(pw_thread_loop_stop_fn) && + IS_FUNC_LOADED(pw_thread_loop_lock_fn) && + IS_FUNC_LOADED(pw_thread_loop_unlock_fn) && +- IS_FUNC_LOADED(pw_properties_new_string_fn)); ++ IS_FUNC_LOADED(pw_thread_loop_signal_fn) && ++ IS_FUNC_LOADED(pw_thread_loop_wait_fn) && ++ IS_FUNC_LOADED(pw_properties_new_string_fn) && ++ IS_FUNC_LOADED(pw_get_library_version_fn)); + + return isLoaded; + } + + bool LoadPWLibrary() { + static PRLibrary* pwLib = nullptr; + static bool pwInitialized = false; + + //TODO Thread safe + if (!pwInitialized) { + pwInitialized = true; + pwLib = PR_LoadLibrary("libpipewire-0.3.so.0"); + if (!pwLib) { + return false; + } + + GET_FUNC(pw_context_connect, pwLib); + GET_FUNC(pw_context_connect_fd, pwLib); + GET_FUNC(pw_context_destroy, pwLib); + GET_FUNC(pw_context_new, pwLib); + GET_FUNC(pw_core_disconnect, pwLib); + GET_FUNC(pw_init, pwLib); + GET_FUNC(pw_stream_add_listener, pwLib); + GET_FUNC(pw_stream_connect, pwLib); ++ GET_FUNC(pw_stream_disconnect, pwLib); + GET_FUNC(pw_stream_dequeue_buffer, pwLib); + GET_FUNC(pw_stream_destroy, pwLib); + GET_FUNC(pw_stream_new, pwLib); + GET_FUNC(pw_stream_queue_buffer, pwLib); + GET_FUNC(pw_stream_update_params, pwLib); + GET_FUNC(pw_thread_loop_destroy, pwLib); + GET_FUNC(pw_thread_loop_get_loop, pwLib); + GET_FUNC(pw_thread_loop_new, pwLib); + GET_FUNC(pw_thread_loop_start, pwLib); + GET_FUNC(pw_thread_loop_stop, pwLib); + GET_FUNC(pw_thread_loop_lock, pwLib); + GET_FUNC(pw_thread_loop_unlock, pwLib); ++ GET_FUNC(pw_thread_loop_signal, pwLib); ++ GET_FUNC(pw_thread_loop_wait, pwLib); + GET_FUNC(pw_properties_new_string, pwLib); ++ GET_FUNC(pw_get_library_version, pwLib); + } + + return IsPwLibraryLoaded(); +@@ -242,6 +255,15 @@ pw_stream_connect(struct pw_stream *stream, + params, n_params); + } + ++int ++pw_stream_disconnect(struct pw_stream *stream) ++{ ++ if (!LoadPWLibrary()) { ++ return 0; ++ } ++ return pw_stream_disconnect_fn(stream); ++} ++ + struct pw_buffer * + pw_stream_dequeue_buffer(struct pw_stream *stream) + { +@@ -356,13 +378,38 @@ pw_thread_loop_unlock(struct pw_thread_loop *loop) + return pw_thread_loop_unlock_fn(loop); + } + ++void ++pw_thread_loop_signal(struct pw_thread_loop *loop, bool wait_for_accept) ++{ ++ if (!LoadPWLibrary()) { ++ return; ++ } ++ return pw_thread_loop_signal_fn(loop, wait_for_accept); ++} ++ ++void ++pw_thread_loop_wait(struct pw_thread_loop *loop) ++{ ++ if (!LoadPWLibrary()) { ++ return; ++ } ++ return pw_thread_loop_wait_fn(loop); ++} + + struct pw_properties * + pw_properties_new_string(const char *str) + { + if (!LoadPWLibrary()) { + return nullptr; + } + return pw_properties_new_string_fn(str); + } + ++const char* ++pw_get_library_version() ++{ ++ if (!LoadPWLibrary()) { ++ return nullptr; ++ } ++ return pw_get_library_version_fn(); ++} diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index 2b77e15..67d1a17 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -26,7 +26,7 @@ If necessary, missing files can be added later. .../newtab/data/content/activity-stream.bundle.js | 2 +- services/settings/Utils.jsm | 2 +- .../periodic-updates/scripts/periodic_file_updates.sh | 2 +- - .../components/backgroundtasks/BackgroundTask_message.jsm | 4 ++-- + .../components/backgroundtasks/BackgroundTask_message.sys.mjs | 4 ++-- toolkit/components/search/SearchUtils.sys.mjs | 8 ++++---- toolkit/components/search/docs/DefaultSearchEngines.rst | 2 +- .../components/search/docs/SearchEngineConfiguration.rst | 2 +- @@ -86,10 +86,10 @@ index f177a1440c..c41b0beece 100755 # 1. List remote settings collections from server. echo "INFO: fetch remote settings list from server" -diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm +diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs index 55e8f70e77..2b5167b36b 100644 ---- a/toolkit/components/backgroundtasks/BackgroundTask_message.jsm -+++ b/toolkit/components/backgroundtasks/BackgroundTask_message.jsm +--- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs ++++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs @@ -19,8 +19,8 @@ // environment variables still apply. // diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2f0789c..2473778 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -70,7 +70,7 @@ pkgname=iceweasel epoch=1 -pkgver=106.0.3 +pkgver=107.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=102.0-1 @@ -96,6 +96,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' replaces=('firefox') options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} + 0001-libwebrtc-screen-cast-sync.patch $pkgname.desktop identity-icons-brand.svg) source=(${source[*]/identity-icons-brand.svg/}) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig} @@ -105,25 +106,26 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra 9004-FSDG-misc.patch process-json-files.py vendor.js.in - zstandard-0.18.0.diff) + zstandard-0.19.0.diff) source_armv7h=(build-arm-libopus.patch) source_i686=(avoid-libxul-OOM-python-check.patch rust-static-disable-network-test-on-static-libraries.patch firefox-106.0.1-fdlibm.patch simd_avx2.patch fix-i686-build-moz-1792159.patch) -sha256sums=('6f7cc633d75872cb8776feefafcec20becb448359bd591f8204a21fd4b845f8e' +sha256sums=('8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a' 'SKIP' + '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049' 'SKIP' - 'bc40dc394d6de5c9db202c049c3fe24ffb547482f838d071d0b896951b25fabf' + '77cfa1e135ba6884ee343468075491b67fe148077e4aebe8bb5ff7b5f6e022c2' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' '0c5333c4fc28ba9ca5b4d00127918d662fe8c570d4ebc0a64e5174e0ef41ae01' '6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65' '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45' - 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be') + '8f5ae64094170978ff97f2c14a14a3ef5e69083aa8b513630725aeaa7e892e8f') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353' '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041' @@ -246,11 +248,16 @@ prepare() { mkdir mozbuild cd firefox-$pkgver + # https://bugs.archlinux.org/task/76231 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790496 + # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/libwebrtc-screen-cast-sync.patch + patch -Np1 -i ../0001-libwebrtc-screen-cast-sync.patch + ## technical patching ## - # Unbreak build with python-zstandard 0.18.0 - echo "applying zstandard-0.18.0.diff" - patch -Np1 -i ../zstandard-0.18.0.diff + # Unbreak build with python-zstandard 0.19.0 + echo "applying zstandard-0.19.0.diff" + patch -Np1 -i ../zstandard-0.19.0.diff case ${CARCH} in aarch64|armv7h) diff --git a/libre/iceweasel/zstandard-0.18.0.diff b/libre/iceweasel/zstandard-0.18.0.diff deleted file mode 100644 index 5dfa305..0000000 --- a/libre/iceweasel/zstandard-0.18.0.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git i/python/sites/mach.txt w/python/sites/mach.txt -index 01f4f8c23da3b..85cfaf2b273ac 100644 ---- i/python/sites/mach.txt -+++ w/python/sites/mach.txt -@@ -134,4 +134,4 @@ pypi-optional:glean-sdk==50.1.0:telemetry will not be collected - # We aren't (yet) able to pin packages in automation, so we have to - # support down to the oldest locally-installed version (5.4.2). - pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data --pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract -+pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract diff --git a/libre/iceweasel/zstandard-0.19.0.diff b/libre/iceweasel/zstandard-0.19.0.diff new file mode 100644 index 0000000..7bf4668 --- /dev/null +++ b/libre/iceweasel/zstandard-0.19.0.diff @@ -0,0 +1,10 @@ +diff --git i/python/sites/mach.txt w/python/sites/mach.txt +index 01f4f8c23da3b..85cfaf2b273ac 100644 +--- i/python/sites/mach.txt ++++ w/python/sites/mach.txt +@@ -134,4 +134,4 @@ pypi-optional:glean-sdk==50.1.0:telemetry will not be collected + # We aren't (yet) able to pin packages in automation, so we have to + # support down to the oldest locally-installed version (5.4.2). + pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data +-pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract ++pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract From f3d0d00718e18250eefe39851e82eca7c94dd778 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Nov 28 2022 13:23:36 +0000 Subject: [PATCH 187/200] [unifont]: Update Unifont to 15.0.01 --- diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD index 243fb9c..e8d9328 100644 --- a/pcr/unifont/PKGBUILD +++ b/pcr/unifont/PKGBUILD @@ -31,22 +31,26 @@ pkgname=('pcf-unifont' 'otf-unifont' 'unifont-utils') pkgbase=unifont -pkgver=14.0.04 +pkgver=15.0.01 pkgrel=1 pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)" arch=('any') # arch=('armv7h' 'i686' 'x86_64') url="http://unifoundry.com/" license=('GPL' 'custom:OFL') -# source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig}) -source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz") -sha256sums=('1f5e517ccf4cb3a09cffe31ac52de70d8f076fe024a4a2453e07db57bb64febb' -# 'SKIP') - ) +source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig}) +sha256sums=('7d11a924bf3c63ea7fdf2da2b96d6d4986435bedfd1e6816c8ac2e6db47634d5' + 'SKIP') validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy build() { cd "${srcdir}"/${pkgbase}-${pkgver} + + local variation + for variation in bold italic bolditalic; do + "mk$variation" "unifont-$pkgver.bdf" | gzip -c >"unifont-$variation-$pkgver.bdf.gz" + done + make } From 49f0463cac153fb3bdcc89a7880f472db1820870 Mon Sep 17 00:00:00 2001 From: Wael Karram Date: Nov 28 2022 13:24:08 +0000 Subject: [PATCH 188/200] [gmid]: upgrade to v1.8.5 --- diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD index 3ca5a5f..b5b2e39 100644 --- a/pcr/gmid/PKGBUILD +++ b/pcr/gmid/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (aur): Andrea Feletto -# Maintainer: Wael Karram -# Contributor: bill-auger +# Maintainer (aur): Andrea Feletto +# Maintainer: Wael Karram +# Contributor: bill-auger # parabola changes and rationale: @@ -9,7 +9,7 @@ pkgname=gmid -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc='Fast Gemini server written with security in mind.' arch=('x86_64') @@ -30,9 +30,9 @@ source=( "gmid.conf" "index.gmi" ) -mksha256sums=('0') # libre source-ball was not needed for this release +mksha256sums=('c5fd6e5bb411a7baafe0b12b2e2bff35ea47231eff803c00c94e78f2bec3f82c') sha256sums=( - 'abecdec3bfc2f2deac9d57b84e43334484fc537e5086a3c061f07f6311c89d2f' + 'bbdf37162add9be254dfd857f69595b5fe882a8a30647d62e7a030c2e2c87c5c' 'SKIP' '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94' '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6' @@ -48,22 +48,38 @@ validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger # However, mksource() is retained for now, # because it is not certain that the files will be absent in the next release; # or perhaps their omission from this release was a happy accident. +_MKSOURCE_ERR_FMT="ERROR:%s mksource() was not applied or needs re-working - sources may contain non-free files" +_nonfree_files=( contrib site ) + + mksource() { cd "$srcdir/$pkgname-$pkgver" # Remove unlicensed files - local nonfree_files=( contrib site ) - for nonfree_file in "${nonfree_files[@]}" - do if [[ -d ${nonfree_file} ]] + for nonfree_file in "${_nonfree_files[@]}" + do + if [[ -d ${nonfree_file} ]] then rm -r ${nonfree_file} else - echo "cannot delete '${nonfree_file}' - mksource() needs re-working" + printf "${_MKSOURCE_ERR_FMT}" "cannot delete '${nonfree_file}' - " return 1 fi done } +prepare() +{ + # verify mksource treatment + for nonfree_file in "${_nonfree_files[@]}" + do + if [[ -d ${nonfree_file} ]] + then + echo "$MKSOURCE_ERR_FMT" + fi + done +} + build() { cd "$srcdir/$pkgname-$pkgver" From dd64de156a91fea0db245bfeda2e725ddf8d203b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Dec 02 2022 12:22:59 +0000 Subject: [PATCH 189/200] [iceweasel]: armv7h --- diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 2473778..3ccad91 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -169,7 +169,7 @@ armv7h) i686) _should_skip_pgo=1 - echo "i686 v>104<106 failed to build - i686 v106 fails to build without --disable-webrtc" + echo "FIXME: v105 fails to build - v106 fails to build without --disable-webrtc" ;; esac @@ -329,24 +329,22 @@ END case ${CARCH} in aarch64|armv7h) - # version-specific hacks - - # FIXME: - echo "FIXME: parabola armv7h fails to build 106 gcc 12" - # | 901:42.65 /tmp/cc2fsVPk.s: Assembler messages: - # | 901:42.65 /tmp/cc2fsVPk.s: Error: .size expression for ff_fft_calc_neon does not evaluate to a constant - # | 901:42.66 /tmp/cc2fsVPk.s: Error: .size expression for ff_fft_permute_neon does not evaluate to a constant - # | 901:42.67 make[4]: *** [/build/iceweasel/src/firefox-106.0.1/config/rules.mk:664: fft_neon.o] Error 1 - # | 901:42.69 make[3]: *** [/build/iceweasel/src/firefox-106.0.1/config/recurse.mk:72: media/ffvpx/libavcodec/arm/target-objects] Error 2 -# cat >> ../mozconfig <> ../mozconfig <