Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] deadbeef: update to 1.8.7 and fix build
@ 2021-02-22  2:44 heliocat
  2021-02-22  9:09 ` ericonr
                   ` (25 more replies)
  0 siblings, 26 replies; 27+ messages in thread
From: heliocat @ 2021-02-22  2:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 9670 bytes --]

From 4195a8b847330fd3bebdf8dd03449285431b6de8 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

---
 .../patch_skip_glade_translations.patch       | 153 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  23 ++-
 2 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..c89792915e0
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,153 @@
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..853600282f0 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,11 +1,12 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+make_build_args="CC=clang"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang $(vopt_if gtk3 glib-devel)"
 makedepends="
  alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
  libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
@@ -16,19 +17,31 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
 homepage="http://deadbeef.sourceforge.net"
 changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
 build_options="gtk3"
 build_options_default="gtk3"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+nopie_files="/usr/bin/deadbeef"
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 pre_configure() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
 	NOCONFIGURE=1 ./autogen.sh
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
@ 2021-02-22  9:09 ` ericonr
  2021-02-22 20:03 ` [PR PATCH] [Updated] " heliocat
                   ` (24 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-22  9:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#issuecomment-783219549

Comment:
For cross you need to pass `--sysroot` and `--target` to clang. You will find the values of those flags in the `python3-pyside2` template.

For i686, it's apparently missing some flag to allow the usage of whatever SIMD it wants. 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
  2021-02-22  9:09 ` ericonr
@ 2021-02-22 20:03 ` heliocat
  2021-02-22 20:23 ` heliocat
                   ` (23 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-22 20:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 9695 bytes --]

From 464214391a0db35699505907108c29ab86fa6bc3 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

---
 .../patch_skip_glade_translations.patch       | 153 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  24 ++-
 2 files changed, 170 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..c89792915e0
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,153 @@
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..37ff00e63cf 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,11 +1,11 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang $(vopt_if gtk3 glib-devel)"
 makedepends="
  alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
  libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
@@ -16,12 +16,18 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
 homepage="http://deadbeef.sourceforge.net"
 changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
+build_options="clang gtk3"
+build_options_default="clang gtk3"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -29,6 +35,10 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 pre_configure() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
 	NOCONFIGURE=1 ./autogen.sh
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
  2021-02-22  9:09 ` ericonr
  2021-02-22 20:03 ` [PR PATCH] [Updated] " heliocat
@ 2021-02-22 20:23 ` heliocat
  2021-02-23 18:27 ` [PR PATCH] [Updated] " heliocat
                   ` (22 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-22 20:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#issuecomment-783650449

Comment:
An overly aggressive method for forcing clang as the compiler was the source of all build issues with the exception of i686, including the lack of PIE. Investigating that and then I'll un-draft this.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (2 preceding siblings ...)
  2021-02-22 20:23 ` heliocat
@ 2021-02-23 18:27 ` heliocat
  2021-02-23 18:39 ` heliocat
                   ` (21 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 18:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 10179 bytes --]

From 62cf0debfe7f80524074fba563c29ef88d9c7789 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

Build with clang, disable the audioscrobbler plugin (shlib dependency on
a library not shipped in Void), disable soundtouch plugin on i686
(depends on SSE being enabled which was getting dropped somewhere along
the line), avoid trying to bundle the glade source files as
translations.
---
 .../patch_skip_glade_translations.patch       | 153 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  30 +++-
 2 files changed, 176 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..c89792915e0
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,153 @@
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..6f454b2de16 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,11 +1,11 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang $(vopt_if gtk3 glib-devel)"
 makedepends="
  alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
  libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
@@ -16,19 +16,35 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
 homepage="http://deadbeef.sourceforge.net"
 changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
+build_options="clang gtk3"
+build_options_default="clang gtk3"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
+# Fixing that might be a good maintainer task.
+if [ "$XBPS_TARGET_MACHINE" = i686 ] ; then
+	configure_args+=" --disable-soundtouch"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 pre_configure() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
 	NOCONFIGURE=1 ./autogen.sh
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (3 preceding siblings ...)
  2021-02-23 18:27 ` [PR PATCH] [Updated] " heliocat
@ 2021-02-23 18:39 ` heliocat
  2021-02-23 19:06 ` [PR PATCH] [Updated] " heliocat
                   ` (20 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 18:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#issuecomment-784422986

Comment:
Done. With. That.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (4 preceding siblings ...)
  2021-02-23 18:39 ` heliocat
@ 2021-02-23 19:06 ` heliocat
  2021-02-23 19:14 ` [PR REVIEW] " ericonr
                   ` (19 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 19:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 10224 bytes --]

From 2b17c6e1c64a74c83b919b601767750a9d115ee7 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

Build with clang, disable the audioscrobbler plugin (shlib dependency on
a library not shipped in Void), disable soundtouch plugin on i686
(depends on SSE being enabled which was getting dropped somewhere along
the line), avoid trying to bundle the glade source files as
translations.
---
 .../patch_skip_glade_translations.patch       | 153 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  31 +++-
 2 files changed, 177 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..c89792915e0
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,153 @@
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..04ddaf6ecd8 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,11 +1,11 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang $(vopt_if gtk3 glib-devel)"
 makedepends="
  alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
  libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
@@ -16,19 +16,36 @@ depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
 homepage="http://deadbeef.sourceforge.net"
 changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
+# clang is a build requirement as of v1.8.5
+build_options="clang gtk3"
+build_options_default="clang gtk3"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
+# Fixing that might be a good maintainer task.
+if [ "$XBPS_TARGET_MACHINE" = i686 ] ; then
+	configure_args+=" --disable-soundtouch"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
 pre_configure() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
 	NOCONFIGURE=1 ./autogen.sh
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (5 preceding siblings ...)
  2021-02-23 19:06 ` [PR PATCH] [Updated] " heliocat
@ 2021-02-23 19:14 ` ericonr
  2021-02-23 19:14 ` ericonr
                   ` (18 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581315631

Comment:
Is this from upstream? Would be nice to have a reason for the patch.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (6 preceding siblings ...)
  2021-02-23 19:14 ` [PR REVIEW] " ericonr
@ 2021-02-23 19:14 ` ericonr
  2021-02-23 19:14 ` ericonr
                   ` (17 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581317306

Comment:
I think we can drop both of these. `clang` is a requirement due to upstream using `-fblocks`, and we don't want GTK2 stuff.

You'd just have to do some slight clean up in `*depends` to remove gtk3 cleanly.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (7 preceding siblings ...)
  2021-02-23 19:14 ` ericonr
@ 2021-02-23 19:14 ` ericonr
  2021-02-23 19:14 ` ericonr
                   ` (16 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581313572

Comment:
They moved to `.io`.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (8 preceding siblings ...)
  2021-02-23 19:14 ` ericonr
@ 2021-02-23 19:14 ` ericonr
  2021-02-23 19:14 ` ericonr
                   ` (15 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581316466

Comment:
notify seems to depend only on dbus, why disable?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (9 preceding siblings ...)
  2021-02-23 19:14 ` ericonr
@ 2021-02-23 19:14 ` ericonr
  2021-02-23 21:56 ` heliocat
                   ` (14 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 19:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581314040

Comment:
Should happen in post extract

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (10 preceding siblings ...)
  2021-02-23 19:14 ` ericonr
@ 2021-02-23 21:56 ` heliocat
  2021-02-23 21:59 ` heliocat
                   ` (13 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 21:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581418458

Comment:
Fixed

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (11 preceding siblings ...)
  2021-02-23 21:56 ` heliocat
@ 2021-02-23 21:59 ` heliocat
  2021-02-23 22:02 ` heliocat
                   ` (12 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 21:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581419956

Comment:
Moved.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (12 preceding siblings ...)
  2021-02-23 21:59 ` heliocat
@ 2021-02-23 22:02 ` heliocat
  2021-02-23 22:06 ` heliocat
                   ` (11 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581421725

Comment:
Yeah, all from upstream.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (13 preceding siblings ...)
  2021-02-23 22:02 ` heliocat
@ 2021-02-23 22:06 ` heliocat
  2021-02-23 22:07 ` heliocat
                   ` (10 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581421725

Comment:
Yeah, all from upstream. I generated the patch from the ```missing``` file dropped by intltoolize. I'm hesitant to comment just because it should be fairly obvious what's going on here.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (14 preceding siblings ...)
  2021-02-23 22:06 ` heliocat
@ 2021-02-23 22:07 ` heliocat
  2021-02-23 22:10 ` ericonr
                   ` (9 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581424566

Comment:
```gtk3``` was there from the 1.8.3 template. I'll strip them both out and see if things still work.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (15 preceding siblings ...)
  2021-02-23 22:07 ` heliocat
@ 2021-02-23 22:10 ` ericonr
  2021-02-23 22:10 ` ericonr
                   ` (8 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 22:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581426496

Comment:
For the record, you want to strip out the `vopt_if gtk3` stuff as well. Otherwise the endeavor won't work :)


^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (16 preceding siblings ...)
  2021-02-23 22:10 ` ericonr
@ 2021-02-23 22:10 ` ericonr
  2021-02-23 22:13 ` heliocat
                   ` (7 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-23 22:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581426701

Comment:
Just put like `Patch from upstream`

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (17 preceding siblings ...)
  2021-02-23 22:10 ` ericonr
@ 2021-02-23 22:13 ` heliocat
  2021-02-23 22:14 ` heliocat
                   ` (6 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 213 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581428217

Comment:
Their notify plugin depends on libdispatch (which we don't ship).

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (18 preceding siblings ...)
  2021-02-23 22:13 ` heliocat
@ 2021-02-23 22:14 ` heliocat
  2021-02-23 22:15 ` heliocat
                   ` (5 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581428723

Comment:
Oh, the patch was written by me, the example junk is from upstream.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (19 preceding siblings ...)
  2021-02-23 22:14 ` heliocat
@ 2021-02-23 22:15 ` heliocat
  2021-02-23 23:02 ` [PR PATCH] [Updated] " heliocat
                   ` (4 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 22:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581428872

Comment:
Obviously ;)

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (20 preceding siblings ...)
  2021-02-23 22:15 ` heliocat
@ 2021-02-23 23:02 ` heliocat
  2021-02-24  0:20 ` heliocat
                   ` (3 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-23 23:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 10662 bytes --]

From 5f89eb979356ae1bf03a72f3adea43794ded0c68 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

Build with clang, disable the audioscrobbler plugin (shlib dependency on
a library not shipped in Void), disable soundtouch plugin on i686
(depends on SSE being enabled which was getting dropped somewhere along
the line), avoid trying to bundle the glade source files as
translations.
---
 .../patch_skip_glade_translations.patch       | 153 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  44 +++--
 2 files changed, 183 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..c89792915e0
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,153 @@
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..0fe491e631f 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,33 +1,49 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang glib-devel"
 makedepends="
- alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
- libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
- libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel libzip-devel
- mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel
- $(vopt_if gtk3 gtk+3-devel gtk+-devel)"
+ alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel gtk+3-devel imlib2-devel
+ jansson-devel libcddb-devel libcdio-devel libcurl-devel libflac-devel
+ libmad-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel
+ libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://deadbeef.sourceforge.net"
-changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
+homepage="https://deadbeef.sourceforge.io"
+changelog="https://deadbeef.sourceforge.io/news0.html"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
+# Fixing that might be a good maintainer task.
+if [ "$XBPS_TARGET_MACHINE" = i686 ] ; then
+	configure_args+=" --disable-soundtouch"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
+post_extract() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (21 preceding siblings ...)
  2021-02-23 23:02 ` [PR PATCH] [Updated] " heliocat
@ 2021-02-24  0:20 ` heliocat
  2021-02-24  0:31 ` [PR REVIEW] " heliocat
                   ` (2 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-24  0:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1770 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages deadbeef
https://github.com/void-linux/void-packages/pull/28965

deadbeef: update to 1.8.7 and fix build
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

A patch file from https://github.com/void-linux/void-packages/pull/28965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-deadbeef-28965.patch --]
[-- Type: text/x-diff, Size: 10889 bytes --]

From 9a08a726621c421cda68ebe51df23f2fca2554d1 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Thu, 18 Feb 2021 09:35:43 -0800
Subject: [PATCH] deadbeef: update to 1.8.7 ; fix build

Build with clang, disable the audioscrobbler plugin (shlib dependency on
a library not shipped in Void), disable soundtouch plugin on i686
(depends on SSE being enabled which was getting dropped somewhere along
the line), avoid trying to bundle the glade source files as
translations.
---
 .../patch_skip_glade_translations.patch       | 157 ++++++++++++++++++
 srcpkgs/deadbeef/template                     |  44 +++--
 2 files changed, 187 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch

diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
new file mode 100644
index 00000000000..a76fecc318b
--- /dev/null
+++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch
@@ -0,0 +1,157 @@
+Upstream packages a number of tools which define translations for gettext to
+process. The glade files don't appear to actually have translation marks which
+causes the build to complain and, in the case of packaging, fail.
+
+--- po/POTFILES.skip.orig	2021-02-20 21:51:50.867875091 -0800
++++ po/POTFILES.skip	2021-02-20 21:51:57.689896618 -0800
+@@ -4,3 +4,151 @@
+ plugins/pltbrowser/support.c
+ plugins/gtkui/support.c
++tools/glade/examples/editor/editor.glade
++tools/glade/examples/editor/src/interface.c
++tools/glade/examples/editor/src/support.c
++tools/glade/glade-2.desktop.in
++tools/glade/glade/editor.c
++tools/glade/glade/gbwidget.c
++tools/glade/glade/gbwidgets/gbaboutdialog.c
++tools/glade/glade/gbwidgets/gbaccellabel.c
++tools/glade/glade/gbwidgets/gbalignment.c
++tools/glade/glade/gbwidgets/gbarrow.c
++tools/glade/glade/gbwidgets/gbaspectframe.c
++tools/glade/glade/gbwidgets/gbbutton.c
++tools/glade/glade/gbwidgets/gbcalendar.c
++tools/glade/glade/gbwidgets/gbcellview.c
++tools/glade/glade/gbwidgets/gbcheckbutton.c
++tools/glade/glade/gbwidgets/gbcheckmenuitem.c
++tools/glade/glade/gbwidgets/gbclist.c
++tools/glade/glade/gbwidgets/gbcolorbutton.c
++tools/glade/glade/gbwidgets/gbcolorselection.c
++tools/glade/glade/gbwidgets/gbcolorselectiondialog.c
++tools/glade/glade/gbwidgets/gbcombo.c
++tools/glade/glade/gbwidgets/gbcombobox.c
++tools/glade/glade/gbwidgets/gbcomboboxentry.c
++tools/glade/glade/gbwidgets/gbctree.c
++tools/glade/glade/gbwidgets/gbcurve.c
++tools/glade/glade/gbwidgets/gbcustom.c
++tools/glade/glade/gbwidgets/gbdialog.c
++tools/glade/glade/gbwidgets/gbdrawingarea.c
++tools/glade/glade/gbwidgets/gbentry.c
++tools/glade/glade/gbwidgets/gbeventbox.c
++tools/glade/glade/gbwidgets/gbexpander.c
++tools/glade/glade/gbwidgets/gbfilechooserbutton.c
++tools/glade/glade/gbwidgets/gbfilechooserdialog.c
++tools/glade/glade/gbwidgets/gbfilechooserwidget.c
++tools/glade/glade/gbwidgets/gbfileselection.c
++tools/glade/glade/gbwidgets/gbfixed.c
++tools/glade/glade/gbwidgets/gbfontbutton.c
++tools/glade/glade/gbwidgets/gbfontselection.c
++tools/glade/glade/gbwidgets/gbfontselectiondialog.c
++tools/glade/glade/gbwidgets/gbframe.c
++tools/glade/glade/gbwidgets/gbgammacurve.c
++tools/glade/glade/gbwidgets/gbhandlebox.c
++tools/glade/glade/gbwidgets/gbhbox.c
++tools/glade/glade/gbwidgets/gbhbuttonbox.c
++tools/glade/glade/gbwidgets/gbhpaned.c
++tools/glade/glade/gbwidgets/gbhruler.c
++tools/glade/glade/gbwidgets/gbhscale.c
++tools/glade/glade/gbwidgets/gbhscrollbar.c
++tools/glade/glade/gbwidgets/gbhseparator.c
++tools/glade/glade/gbwidgets/gbiconview.c
++tools/glade/glade/gbwidgets/gbimage.c
++tools/glade/glade/gbwidgets/gbimagemenuitem.c
++tools/glade/glade/gbwidgets/gbinputdialog.c
++tools/glade/glade/gbwidgets/gblabel.c
++tools/glade/glade/gbwidgets/gblayout.c
++tools/glade/glade/gbwidgets/gblist.c
++tools/glade/glade/gbwidgets/gblistitem.c
++tools/glade/glade/gbwidgets/gbmenu.c
++tools/glade/glade/gbwidgets/gbmenubar.c
++tools/glade/glade/gbwidgets/gbmenuitem.c
++tools/glade/glade/gbwidgets/gbmenutoolbutton.c
++tools/glade/glade/gbwidgets/gbnotebook.c
++tools/glade/glade/gbwidgets/gboptionmenu.c
++tools/glade/glade/gbwidgets/gbpreview.c
++tools/glade/glade/gbwidgets/gbprogressbar.c
++tools/glade/glade/gbwidgets/gbradiobutton.c
++tools/glade/glade/gbwidgets/gbradiomenuitem.c
++tools/glade/glade/gbwidgets/gbradiotoolbutton.c
++tools/glade/glade/gbwidgets/gbscrolledwindow.c
++tools/glade/glade/gbwidgets/gbseparatormenuitem.c
++tools/glade/glade/gbwidgets/gbseparatortoolitem.c
++tools/glade/glade/gbwidgets/gbspinbutton.c
++tools/glade/glade/gbwidgets/gbstatusbar.c
++tools/glade/glade/gbwidgets/gbtable.c
++tools/glade/glade/gbwidgets/gbtextview.c
++tools/glade/glade/gbwidgets/gbtogglebutton.c
++tools/glade/glade/gbwidgets/gbtoggletoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolbar.c
++tools/glade/glade/gbwidgets/gbtoolbutton.c
++tools/glade/glade/gbwidgets/gbtoolitem.c
++tools/glade/glade/gbwidgets/gbtreeview.c
++tools/glade/glade/gbwidgets/gbvbox.c
++tools/glade/glade/gbwidgets/gbvbuttonbox.c
++tools/glade/glade/gbwidgets/gbviewport.c
++tools/glade/glade/gbwidgets/gbvpaned.c
++tools/glade/glade/gbwidgets/gbvruler.c
++tools/glade/glade/gbwidgets/gbvscale.c
++tools/glade/glade/gbwidgets/gbvscrollbar.c
++tools/glade/glade/gbwidgets/gbvseparator.c
++tools/glade/glade/gbwidgets/gbwindow.c
++tools/glade/glade/glade.c
++tools/glade/glade/glade_atk.c
++tools/glade/glade/glade_clipboard.c
++tools/glade/glade/glade_gnome.c
++tools/glade/glade/glade_gnomelib.c
++tools/glade/glade/glade_gtk12lib.c
++tools/glade/glade/glade_keys_dialog.c
++tools/glade/glade/glade_menu_editor.c
++tools/glade/glade/glade_palette.c
++tools/glade/glade/glade_project.c
++tools/glade/glade/glade_project_options.c
++tools/glade/glade/glade_project_window.c
++tools/glade/glade/gnome-db/gnomedbcombo.c
++tools/glade/glade/gnome-db/gnomedbconnectprop.c
++tools/glade/glade/gnome-db/gnomedbdsnconfig.c
++tools/glade/glade/gnome-db/gnomedbdsndruid.c
++tools/glade/glade/gnome-db/gnomedbeditor.c
++tools/glade/glade/gnome-db/gnomedberror.c
++tools/glade/glade/gnome-db/gnomedberrordlg.c
++tools/glade/glade/gnome-db/gnomedbform.c
++tools/glade/glade/gnome-db/gnomedbgraybar.c
++tools/glade/glade/gnome-db/gnomedbgrid.c
++tools/glade/glade/gnome-db/gnomedblogin.c
++tools/glade/glade/gnome-db/gnomedblogindlg.c
++tools/glade/glade/gnome-db/gnomedbprovidersel.c
++tools/glade/glade/gnome-db/gnomedbsourcesel.c
++tools/glade/glade/gnome-db/gnomedbtableeditor.c
++tools/glade/glade/gnome/bonobodock.c
++tools/glade/glade/gnome/bonobodockitem.c
++tools/glade/glade/gnome/gnomeabout.c
++tools/glade/glade/gnome/gnomeapp.c
++tools/glade/glade/gnome/gnomeappbar.c
++tools/glade/glade/gnome/gnomecanvas.c
++tools/glade/glade/gnome/gnomecolorpicker.c
++tools/glade/glade/gnome/gnomecontrol.c
++tools/glade/glade/gnome/gnomedateedit.c
++tools/glade/glade/gnome/gnomedialog.c
++tools/glade/glade/gnome/gnomedruid.c
++tools/glade/glade/gnome/gnomedruidpageedge.c
++tools/glade/glade/gnome/gnomedruidpagestandard.c
++tools/glade/glade/gnome/gnomeentry.c
++tools/glade/glade/gnome/gnomefileentry.c
++tools/glade/glade/gnome/gnomefontpicker.c
++tools/glade/glade/gnome/gnomehref.c
++tools/glade/glade/gnome/gnomeiconentry.c
++tools/glade/glade/gnome/gnomeiconlist.c
++tools/glade/glade/gnome/gnomeiconselection.c
++tools/glade/glade/gnome/gnomemessagebox.c
++tools/glade/glade/gnome/gnomepixmap.c
++tools/glade/glade/gnome/gnomepixmapentry.c
++tools/glade/glade/gnome/gnomepropertybox.c
++tools/glade/glade/main.c
++tools/glade/glade/palette.c
++tools/glade/glade/property.c
++tools/glade/glade/save.c
++tools/glade/glade/source.c
++tools/glade/glade/tree.c
++tools/glade/glade/utils.c
diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index bd2823649a1..0fe491e631f 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -1,33 +1,49 @@
 # Template file for 'deadbeef'
 pkgname=deadbeef
-version=1.8.3
+version=1.8.7
 revision=1
 build_style=gnu-configure
-configure_args="--disable-oss $(vopt_if gtk3 --disable-gtk2 --disable-gtk3)"
+configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
- yasm $(vopt_if gtk3 glib-devel)"
+ yasm clang glib-devel"
 makedepends="
- alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel imlib2-devel jansson-devel
- libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel
- libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel libzip-devel
- mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel
- $(vopt_if gtk3 gtk+3-devel gtk+-devel)"
+ alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel gtk+3-devel imlib2-devel
+ jansson-devel libcddb-devel libcdio-devel libcurl-devel libflac-devel
+ libmad-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel
+ libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player for GNU/Linux"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="http://deadbeef.sourceforge.net"
-changelog="http://deadbeef.sourceforge.net/news0.html"
-distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=f239af734dea096083e9fb907ef262099a54c2c6c93683ed76b132d41f10ccd8
-build_options="gtk3"
-build_options_default="gtk3"
+_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95
+_mp4p_commit=f111d7aa10d4516f5e02465245e9202db83b7c10
+homepage="https://deadbeef.sourceforge.io"
+changelog="https://deadbeef.sourceforge.io/news0.html"
+distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz
+ https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz
+ https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz"
+checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27
+ c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286
+ 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d"
 LDFLAGS+=" -Wl,-z,stack-size=1048576"
 
+# The soundtouchup plugin was made default in 1.8.4 and fails to build on i686.
+# Fixing that might be a good maintainer task.
+if [ "$XBPS_TARGET_MACHINE" = i686 ] ; then
+	configure_args+=" --disable-soundtouch"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
+post_extract() {
+	rm -rf external/apbuild
+	rm -rf external/mp4p
+	mv -v ../apbuild-${_apbuild_commit} external/apbuild
+	mv -v ../mp4p-${_mp4p_commit} external/mp4p
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR REVIEW] deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (22 preceding siblings ...)
  2021-02-24  0:20 ` heliocat
@ 2021-02-24  0:31 ` heliocat
  2021-02-24  0:31 ` heliocat
  2021-02-24  3:37 ` [PR PATCH] [Closed]: " ericonr
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-24  0:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#discussion_r581497648

Comment:
Commented

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (23 preceding siblings ...)
  2021-02-24  0:31 ` [PR REVIEW] " heliocat
@ 2021-02-24  0:31 ` heliocat
  2021-02-24  3:37 ` [PR PATCH] [Closed]: " ericonr
  25 siblings, 0 replies; 27+ messages in thread
From: heliocat @ 2021-02-24  0:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/28965#issuecomment-784636351

Comment:
I think I've touched on and addressed everything.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Closed]: deadbeef: update to 1.8.7 and fix build
  2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
                   ` (24 preceding siblings ...)
  2021-02-24  0:31 ` heliocat
@ 2021-02-24  3:37 ` ericonr
  25 siblings, 0 replies; 27+ messages in thread
From: ericonr @ 2021-02-24  3:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There's a closed pull request on the void-packages repository

deadbeef: update to 1.8.7 and fix build
https://github.com/void-linux/void-packages/pull/28965

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->
This is a WIP but I want to let the CI system do a pass for the non-x86_64 architectures while I work on convincing their build integration to link a PIE binary.

^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2021-02-24  3:37 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-22  2:44 [PR PATCH] deadbeef: update to 1.8.7 and fix build heliocat
2021-02-22  9:09 ` ericonr
2021-02-22 20:03 ` [PR PATCH] [Updated] " heliocat
2021-02-22 20:23 ` heliocat
2021-02-23 18:27 ` [PR PATCH] [Updated] " heliocat
2021-02-23 18:39 ` heliocat
2021-02-23 19:06 ` [PR PATCH] [Updated] " heliocat
2021-02-23 19:14 ` [PR REVIEW] " ericonr
2021-02-23 19:14 ` ericonr
2021-02-23 19:14 ` ericonr
2021-02-23 19:14 ` ericonr
2021-02-23 19:14 ` ericonr
2021-02-23 21:56 ` heliocat
2021-02-23 21:59 ` heliocat
2021-02-23 22:02 ` heliocat
2021-02-23 22:06 ` heliocat
2021-02-23 22:07 ` heliocat
2021-02-23 22:10 ` ericonr
2021-02-23 22:10 ` ericonr
2021-02-23 22:13 ` heliocat
2021-02-23 22:14 ` heliocat
2021-02-23 22:15 ` heliocat
2021-02-23 23:02 ` [PR PATCH] [Updated] " heliocat
2021-02-24  0:20 ` heliocat
2021-02-24  0:31 ` [PR REVIEW] " heliocat
2021-02-24  0:31 ` heliocat
2021-02-24  3:37 ` [PR PATCH] [Closed]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).