Compare commits
No commits in common. "50ad83b47ba61475344dbee103bf9372a4ac59f1" and "71cac5b09c8d00933a6d9e8b776ee41b203eb630" have entirely different histories.
50ad83b47b
...
71cac5b09c
11
.SRCINFO
11
.SRCINFO
@ -1,6 +1,6 @@
|
||||
pkgbase = butt
|
||||
pkgdesc = Easy to use, multi OS streaming tool
|
||||
pkgver = 1.45.0
|
||||
pkgver = 1.44.0
|
||||
pkgrel = 1
|
||||
url = https://danielnoethen.de/butt/
|
||||
arch = i686
|
||||
@ -19,10 +19,9 @@ pkgbase = butt
|
||||
depends = flac
|
||||
depends = opus
|
||||
depends = libsamplerate
|
||||
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
|
||||
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
|
||||
|
||||
pkgname = butt
|
||||
|
||||
29
PKGBUILD
29
PKGBUILD
@ -5,37 +5,26 @@
|
||||
# Contributor: Kosava <kosava@gmail.com>
|
||||
|
||||
pkgname=butt
|
||||
pkgver=1.45.0
|
||||
pkgver=1.44.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' 'libdatachannel')
|
||||
depends=('fltk' 'dbus' 'portaudio' 'portmidi' 'libfdk-aac' 'libvorbis' 'libogg' 'lame' 'flac' 'opus' 'libsamplerate')
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://danielnoethen.de/${pkgname}/release/${pkgver}/${pkgname}-${pkgver}.tar.gz"
|
||||
'add-required-time-header.patch'
|
||||
'fix-locale.patch'
|
||||
'fix-fltk14.patch')
|
||||
sha256sums=('88498510946c4ef1de28662f9e1cd85d20bfab40d2c3467f6202b86ee0ed8364'
|
||||
'a4d8f0fbde457366467b5ae0d2b31ad0f733cb1154a18e84a36a106c7301b5d8'
|
||||
'0e18d826db9e6a1d542bb9934c61209ca63f4f9fc3f9ccc54fbd4a143a516e9d'
|
||||
SKIP)
|
||||
'add-ctime-header.patch')
|
||||
sha256sums=('d910b40a10dbca1ce377ee239c146e4746e8b48550ba0a40d6b5199b5c87e0a7'
|
||||
'3c467e58afff269da76dad3aa1a16cdd51edcb77463fc6e0609a738b80c30dba')
|
||||
|
||||
prepare() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
patch -Np1 -i ../add-required-time-header.patch
|
||||
patch -Np1 -i ../fix-locale.patch
|
||||
patch -Np1 -i ../fix-fltk14.patch
|
||||
patch -Np1 -i ../add-ctime-header.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
|
||||
# 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}"
|
||||
|
||||
./configure --with-client --prefix=/usr LDFLAGS="-L$(dirname $(fltk-config --libs))"
|
||||
make
|
||||
}
|
||||
|
||||
@ -59,7 +48,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}/LICENSE"
|
||||
ln -s "/usr/share/doc/${pkgname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
|
||||
|
||||
# Pixmaps
|
||||
for file in usr/share/pixmaps/"${pkgname}"*; do
|
||||
@ -67,3 +56,5 @@ package() {
|
||||
install -Dm644 "${file}" "${pkgdir}/usr/share/pixmaps/${filename}"
|
||||
done
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
||||
11
add-ctime-header.patch
Normal file
11
add-ctime-header.patch
Normal file
@ -0,0 +1,11 @@
|
||||
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"
|
||||
@ -1,11 +0,0 @@
|
||||
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>
|
||||
@ -1,8 +0,0 @@
|
||||
--- 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
|
||||
@ -1,12 +0,0 @@
|
||||
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>
|
||||
Loading…
Reference in New Issue
Block a user