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

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).