Compare commits

..

10 Commits

Author SHA1 Message Date
bach
50ad83b47b compile locale & fltk14 bug fix 2025-10-02 10:06:40 +02:00
David Cooper
21d50c3532 wrong pkgrel 2025-05-03 17:30:25 -04:00
David Cooper
90993957f0 Bump version 2025-05-03 17:24:06 -04:00
David Cooper
6f74d574be Fix caching problem with package version 2025-01-28 11:23:55 -05:00
David Cooper
b6a55af823 Bump upstream (no version change) 2025-01-23 15:56:35 -05:00
David Cooper
97e7a07285 Fix build warnings 2024-12-26 15:25:54 -05:00
David Cooper
fb1619ffaf COPYING -> LICENSE 2024-12-04 13:43:17 -05:00
David Cooper
3286e4473e Remove --color from patch 2024-12-03 13:47:34 -05:00
David Cooper
e5fdcb92cb Add <time.h> instead of <ctime> 2024-12-03 13:45:13 -05:00
David Cooper
4634b4218f Add '--enable-webrtc' flag 2024-12-03 13:34:32 -05:00
6 changed files with 56 additions and 26 deletions

View File

@ -1,6 +1,6 @@
pkgbase = butt
pkgdesc = Easy to use, multi OS streaming tool
pkgver = 1.44.0
pkgver = 1.45.0
pkgrel = 1
url = https://danielnoethen.de/butt/
arch = i686
@ -19,9 +19,10 @@ pkgbase = butt
depends = flac
depends = opus
depends = libsamplerate
source = butt-1.44.0.tar.gz::https://danielnoethen.de/butt/release/1.44.0/butt-1.44.0.tar.gz
source = add-ctime-header.patch
sha256sums = d910b40a10dbca1ce377ee239c146e4746e8b48550ba0a40d6b5199b5c87e0a7
sha256sums = 3c467e58afff269da76dad3aa1a16cdd51edcb77463fc6e0609a738b80c30dba
depends = libdatachannel
source = butt-1.45.0.tar.gz::https://danielnoethen.de/butt/release/1.45.0/butt-1.45.0.tar.gz
source = add-required-time-header.patch
sha256sums = 88498510946c4ef1de28662f9e1cd85d20bfab40d2c3467f6202b86ee0ed8364
sha256sums = a4d8f0fbde457366467b5ae0d2b31ad0f733cb1154a18e84a36a106c7301b5d8
pkgname = butt

View File

@ -5,26 +5,37 @@
# Contributor: Kosava <kosava@gmail.com>
pkgname=butt
pkgver=1.44.0
pkgver=1.45.0
pkgrel=1
pkgdesc="Easy to use, multi OS streaming tool"
arch=('i686' 'x86_64' 'aarch64' 'armv7h')
license=('GPL2')
url="https://danielnoethen.de/butt/"
depends=('fltk' 'dbus' 'portaudio' 'portmidi' 'libfdk-aac' 'libvorbis' 'libogg' 'lame' 'flac' 'opus' 'libsamplerate')
depends=('fltk' 'dbus' 'portaudio' 'portmidi' 'libfdk-aac' 'libvorbis' 'libogg' 'lame' 'flac' 'opus' 'libsamplerate' 'libdatachannel')
source=("${pkgname}-${pkgver}.tar.gz::https://danielnoethen.de/${pkgname}/release/${pkgver}/${pkgname}-${pkgver}.tar.gz"
'add-ctime-header.patch')
sha256sums=('d910b40a10dbca1ce377ee239c146e4746e8b48550ba0a40d6b5199b5c87e0a7'
'3c467e58afff269da76dad3aa1a16cdd51edcb77463fc6e0609a738b80c30dba')
'add-required-time-header.patch'
'fix-locale.patch'
'fix-fltk14.patch')
sha256sums=('88498510946c4ef1de28662f9e1cd85d20bfab40d2c3467f6202b86ee0ed8364'
'a4d8f0fbde457366467b5ae0d2b31ad0f733cb1154a18e84a36a106c7301b5d8'
'0e18d826db9e6a1d542bb9934c61209ca63f4f9fc3f9ccc54fbd4a143a516e9d'
SKIP)
prepare() {
cd "${pkgname}-${pkgver}"
patch -Np1 -i ../add-ctime-header.patch
patch -Np1 -i ../add-required-time-header.patch
patch -Np1 -i ../fix-locale.patch
patch -Np1 -i ../fix-fltk14.patch
}
build() {
cd "${pkgname}-${pkgver}"
./configure --with-client --prefix=/usr LDFLAGS="-L$(dirname $(fltk-config --libs))"
# Replacing _FORTIFY_SOURCE here fixes build warnings
./configure --with-client --enable-webrtc --prefix=/usr \
CFLAGS="${CFLAGS/_FORTIFY_SOURCE=?/_FORTIFY_SOURCE=2}" \
CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=?/_FORTIFY_SOURCE=2}"
make
}
@ -48,7 +59,7 @@ package() {
install -Dm644 "${doc}" "${pkgdir}/usr/share/doc/${pkgname}/${doc}"
done
install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
ln -s "/usr/share/doc/${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
ln -s "/usr/share/doc/${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# Pixmaps
for file in usr/share/pixmaps/"${pkgname}"*; do
@ -56,5 +67,3 @@ package() {
install -Dm644 "${file}" "${pkgdir}/usr/share/pixmaps/${filename}"
done
}
# vim:set ts=2 sw=2 et:

View File

@ -1,11 +0,0 @@
diff --color -ura butt-1.44.0.orig/src/butt.cpp butt-1.44.0.new/src/butt.cpp
--- butt-1.44.0.orig/src/butt.cpp 2024-12-02 10:16:36.007919951 -0500
+++ butt-1.44.0.new/src/butt.cpp 2024-12-02 10:16:51.167869667 -0500
@@ -47,6 +47,7 @@
#include "butt.h"
#include "command.h"
#include "sockfuncs.h"
+#include <ctime>
#ifndef BUILD_CLIENT
#include "cfg.h"
#include "port_audio.h"

View File

@ -0,0 +1,11 @@
diff -ura butt-1.44.0.orig/src/butt.cpp butt-1.44.0.new/src/butt.cpp
--- butt-1.44.0.orig/src/butt.cpp 2024-12-03 13:40:43.270943967 -0500
+++ butt-1.44.0.new/src/butt.cpp 2024-12-03 13:41:13.864214094 -0500
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <time.h>
#include <signal.h>
#include <limits.h>

8
fix-fltk14.patch Normal file
View File

@ -0,0 +1,8 @@
--- butt-1.44.0.orig/src/FLTK/FL/Fl_My_Native_File_Chooser.H
+++ butt-1.44.0.orig/src/FLTK/FL/Fl_My_Native_File_Chooser.H
@@ -40,6 +40,7 @@
#if !defined(__APPLE__) && !defined(WIN32)
+#include <cstdlib>
#include <FL/Fl_File_Chooser.H>
#else
#include <FL/filename.H> // FL_EXPORT

12
fix-locale.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ura butt-1.44.0.orig/src/butt.cpp butt-1.44.0.new/src/butt.cpp
--- butt-1.44.0.orig/src/butt.cpp 2024-12-03 13:40:43.270943967 -0500
+++ butt-1.44.0.new/src/butt.cpp 2024-12-03 13:41:13.864214094 -0500
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
+#include <locale.h>
#include <signal.h>
#include <limits.h>