diff --git a/pavucontrol/.footprint b/pavucontrol/.footprint index 70b693596..faf7e56c3 100644 --- a/pavucontrol/.footprint +++ b/pavucontrol/.footprint @@ -3,8 +3,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pavucontrol drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ --rw-r--r-- root/root usr/share/applications/pavucontrol.desktop -drwxr-xr-x root/root usr/share/pavucontrol/ --rw-r--r-- root/root usr/share/pavucontrol/pavucontrol.glade -drwxr-xr-x root/root usr/share/pixmaps/ --rwxr-xr-x root/root usr/share/pixmaps/pavucontrol.png +-rw-r--r-- root/root usr/share/applications/org.pulseaudio.pavucontrol.desktop +drwxr-xr-x root/root usr/share/metainfo/ +-rw-r--r-- root/root usr/share/metainfo/org.pulseaudio.pavucontrol.metainfo.xml diff --git a/pavucontrol/.signature b/pavucontrol/.signature index 6557f08cc..c9c7beefc 100644 --- a/pavucontrol/.signature +++ b/pavucontrol/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38gNqAvmLf4BYAsV9nsmQjX0WYmXJwMsfFGw52ENKl0Ss29yDtkvG6QcPTPN23i+yzuP/v2qTSs8MizeP04EBwI= -SHA256 (Pkgfile) = b488cc76d3295a1c9f0ad0f82cc43324c03ad78e3047da9e95004b99cf01084d -SHA256 (.footprint) = fe3cc07f9e2fc6acb78b68ee2c09640e11e6cc9d6ad148192aae2adfb9c77d08 -SHA256 (pavucontrol-5.0.tar.gz) = 816ad421867f2575e19cfc08e37a2f75ea380303e9227acb51ac11ab6ab1800e -SHA256 (pavucontrol.desktop) = 0b09da226157f87a4a13c95780ddc5d2337f2c10bb713dad4037d3af36025001 -SHA256 (org.pulseaudio.pavucontrol.png) = 32d002e39f709ca347aa86c4e902e2bd5cb1341bf4857d9e6f89fd05a9d6554a +RWSagIOpLGJF3wIdVEn/QgU1o+e2zp9HQZWhXtwGOe9NMZi7MtQW2sceect23D+SlPuas9MSlS7RuLqkyELHSMDbfsAGJkzyiQo= +SHA256 (Pkgfile) = eba3606d8f813b276c0e311ed0a3e1c6c459d04ed5e67b25d29d3adabf3b426d +SHA256 (.footprint) = b82c4476ad6aef9d1beccb6c45ba2b85a5bbbe6e0d6c58450b6ba3c21a05167b +SHA256 (pavucontrol-6.0.tar.gz) = d2e58ad26a1d66a9dea61f6f05a894624cc8996d35369cc977bc9d1629b4a0b8 diff --git a/pavucontrol/Pkgfile b/pavucontrol/Pkgfile index 204e5e867..109c221b9 100644 --- a/pavucontrol/Pkgfile +++ b/pavucontrol/Pkgfile @@ -1,28 +1,24 @@ # Description: PulseAudio Volume Control # URL: https://freedesktop.org/software/pulseaudio/pavucontrol/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: gtkmm3 json-glib libcanberra pulseaudio +# Depends on: gtkmm4 json-glib pulseaudio +# Optional: libcanberra name=pavucontrol -version=5.0 -release=2 -source=(http://freedesktop.org/software/pulseaudio/$name/$name-$version.tar.gz - # https://dl.flathub.org/repo/appstream/x86_64/icons/128x128/org.pulseaudio.pavucontrol.png - pavucontrol.desktop - org.pulseaudio.pavucontrol.png) +version=6.0 +release=1 +source=(http://freedesktop.org/software/pulseaudio/$name/$name-$version.tar.gz) build() { - export CXXFLAGS="${CXXFLAGs} -std=c++11" - - cd $name-$version - ./configure --prefix=/usr \ - --disable-lynx \ - --disable-nls - make - make DESTDIR=$PKG install + meson setup $name-$version build \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D lynx=false + meson compile -C build + DESTDIR=$PKG meson install -C build rm -r $PKG/usr/share/{doc,locale} - - install -Dm755 $SRC/org.pulseaudio.pavucontrol.png $PKG/usr/share/pixmaps/pavucontrol.png - install -Dm644 $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop } diff --git a/pavucontrol/org.pulseaudio.pavucontrol.png b/pavucontrol/org.pulseaudio.pavucontrol.png deleted file mode 100644 index 0be8b253a..000000000 Binary files a/pavucontrol/org.pulseaudio.pavucontrol.png and /dev/null differ diff --git a/pavucontrol/pavucontrol.desktop b/pavucontrol/pavucontrol.desktop deleted file mode 100644 index a1cd01af8..000000000 --- a/pavucontrol/pavucontrol.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PulseAudio Volume Control -GenericName=Volume Control -Comment=Adjust the volume level -Exec=pavucontrol -Icon=pavucontrol -Terminal=false -StartupNotify=true -Type=Application -Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings; -Keywords=pavucontrol;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;