# HG changeset patch # User Stanislas Leduc # Date 1727107990 -7200 # Node ID 0d41479b7e7f792ebf2dab8288c8652894b5b307 # Parent 24024e28a27b1027b5e8092199cb6ba9c0cc228d Add ffado and depends/bdepends diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++-dev/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,21 @@ +# SliTaz package receipt. + +PACKAGE="dbus-c++-dev" +VERSION="0.9.0" +CATEGORY="x-window" +SHORT_DESC="A C++ API for D-BUS - development files." +MAINTAINER="maintainer@slitaz.org" +LICENSE="LGPL2" +WEB_SITE="https://sourceforge.net/projects/dbus-cplusplus/" +WANTED="dbus-c++" + +DEPENDS="dbus-c++" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + get_dev_files + + # Ensure remove .la files + find $fs -name "*.la" -delete +} diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,53 @@ +# SliTaz package receipt. + +PACKAGE="dbus-c++" +VERSION="0.9.0" +CATEGORY="x-window" +SHORT_DESC="A C++ API for D-BUS." +MAINTAINER="maintainer@slitaz.org" +LICENSE="LGPL2" +WEB_SITE="https://sourceforge.net/projects/dbus-cplusplus/" + +TARBALL="lib$PACKAGE-$VERSION.tar.gz" +WGET_URL="$SF_MIRROR/dbus-cplusplus/$TARBALL" + +DEPENDS="expat dbus libdbus-c++" +BUILD_DEPENDS="automake libtool expat-dev dbus-dev" + +# Rules to configure and make the package. +compile_rules() +{ + patch -Np0 -i $stuff/dbus-c++-0.9.0-gcc47.patch + # https://sourceforge.net/p/dbus-cplusplus/patches/18/ + patch -Np1 -i $stuff/dbus-c++-0.9.0-disable-threading.patch + # https://sourceforge.net/p/dbus-cplusplus/patches/19/ + patch -Np1 -i $stuff/dbus-c++-0.9.0-fix-writechar.patch + # https://sourceforge.net/p/dbus-cplusplus/patches/22/ + patch -Np1 -i $stuff/dbus-c++-0.9.0-template-operators.patch + # https://sourceforge.net/p/dbus-cplusplus/patches/27/ + patch -Np1 -i $stuff/dbus-c++-0.9.0-copy_data_from_received_message.patch + + autoreconf -vfi + + ./configure \ + --disable-ecore \ + --disable-static \ + --disable-tests \ + --disable-examples \ + --enable-glib \ + --prefix=/usr \ + $CONFIGURE_ARGS && + + # Prevent overlinking + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make && + make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr + cp -a $install/usr/bin $fs/usr +} diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/stuff/dbus-c++-0.9.0-copy_data_from_received_message.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-copy_data_from_received_message.patch Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,27 @@ +From 2a770f61c060d19f7fe118c2a066306fa3e9ec3d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20Goudout?= +Date: Thu, 1 Aug 2019 08:24:29 +0000 +Subject: [PATCH] Fix assert fail when copying data from received message + +--- + src/message.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/message.cpp b/src/message.cpp +index 3f0cac4..1c4caab 100644 +--- a/src/message.cpp ++++ b/src/message.cpp +@@ -350,7 +350,9 @@ void MessageIter::copy_data(MessageIter &to) + ( + (DBusMessageIter *) & (to._iter), + from.type(), +- from.type() == DBUS_TYPE_VARIANT ? NULL : sig, ++ (from.type() == DBUS_TYPE_STRUCT || from.type() == DBUS_TYPE_DICT_ENTRY) ++ ? NULL ++ : sig, + (DBusMessageIter *) & (to_container._iter) + ); + +-- +2.22.0 + diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/stuff/dbus-c++-0.9.0-disable-threading.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-disable-threading.patch Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,45 @@ +--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading 2017-02-15 13:40:53.796004263 +0000 ++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h 2017-02-15 13:40:46.907000493 +0000 +@@ -188,6 +188,7 @@ + /* classes for multithreading support + */ + ++#if 0 + class DXXAPI Mutex + { + public: +@@ -243,9 +244,11 @@ + typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout); + typedef void (*CondVarWakeOneFn)(CondVar *cv); + typedef void (*CondVarWakeAllFn)(CondVar *cv); ++#endif + + void DXXAPI _init_threading(); + ++#if 0 + void DXXAPI _init_threading( + MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn, + CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn, CondVarWakeOneFn, CondVarWakeAllFn +@@ -312,6 +315,7 @@ + cv->wake_all(); + } + }; ++#endif + + } /* namespace DBus */ + +--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading 2017-02-15 13:48:22.627249868 +0000 ++++ libdbus-c++-0.9.0/src/dispatcher.cpp 2017-02-15 13:48:29.164253445 +0000 +@@ -253,6 +253,7 @@ + #endif//DBUS_HAS_THREADS_INIT_DEFAULT + } + ++#if 0 + void DBus::_init_threading( + MutexNewFn m1, + MutexFreeFn m2, +@@ -318,3 +319,4 @@ + #endif//DBUS_HAS_RECURSIVE_MUTEX + dbus_threads_init(&functions); + } ++#endif diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/stuff/dbus-c++-0.9.0-fix-writechar.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-fix-writechar.patch Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,9 @@ +--- libdbus-c++-0.9.0/src/pipe.cpp.writechar 2017-02-16 11:07:13.591950169 +0000 ++++ libdbus-c++-0.9.0/src/pipe.cpp 2017-02-16 11:04:17.158796092 +0000 +@@ -83,5 +83,5 @@ + void Pipe::signal() + { + // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... +- ::write(_fd_write, '\0', 1); ++ ::write(_fd_write, "", 1); + } diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/stuff/dbus-c++-0.9.0-gcc47.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-gcc47.patch Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,10 @@ +--- src/eventloop-integration.cpp.orig 2012-05-09 11:22:09.683290763 +0200 ++++ src/eventloop-integration.cpp 2012-05-09 11:22:44.313288912 +0200 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + using namespace DBus; + using namespace std; diff -r 24024e28a27b -r 0d41479b7e7f dbus-c++/stuff/dbus-c++-0.9.0-template-operators.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dbus-c++/stuff/dbus-c++-0.9.0-template-operators.patch Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,88 @@ +commit a0b9ef3b469ca23c6a3229d8abb967cbbddcee38 +Author: Peter Williams +Date: Sat Dec 19 21:12:46 2015 -0500 + + Fix some weird template/operator issues on OS X. + + I frankly don't understand at all what's going on here. These fixes + derive from: + + https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/c3f69f6be02e31521474dce7eadf6ba4f4a7ce94 + https://chromium.googlesource.com/chromiumos/third_party/dbus-cplusplus/+/7104857773f790a549d399715482fa23d9b736cd + + Except I've dropped some changes that break the OS X build for me. Frankly, if + it compiles, that's good enough for me. + +diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h +index 044e72b..7b3108f 100644 +--- a/include/dbus-c++/types.h ++++ b/include/dbus-c++/types.h +@@ -89,13 +89,7 @@ public: + } + + template +- operator T() const +- { +- T cast; +- MessageIter ri = _msg.reader(); +- ri >> cast; +- return cast; +- } ++ operator T() const; + + private: + +@@ -316,7 +310,7 @@ struct type< Struct> (DBus::MessageIter &iter, DBus::Signature + return ++iter; + } + ++extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val); ++ + template + inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector& val) + { +@@ -644,7 +640,16 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Struct> (DBus::MessageIter &iter, DBus::Variant &val); ++template ++inline DBus::Variant::operator T() const ++{ ++ T cast; ++ DBus::MessageIter ri = _msg.reader(); ++ ri >> cast; ++ return cast; ++} ++ ++} /* namespace DBus */ + + #endif//__DBUSXX_TYPES_H + +diff --git a/src/types.cpp b/src/types.cpp +index d414a3e..70f9ac0 100644 +--- a/src/types.cpp ++++ b/src/types.cpp +@@ -34,7 +34,7 @@ + #include "message_p.h" + #include "internalerror.h" + +-using namespace DBus; ++namespace DBus { + + Variant::Variant() + : _msg(CallMessage()) // dummy message used as temporary storage for variant data +@@ -104,3 +104,4 @@ MessageIter &operator >> (MessageIter &iter, Variant &val) + return ++iter; + } + ++} /* namespace DBus */ diff -r 24024e28a27b -r 0d41479b7e7f ffado-tools/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ffado-tools/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="ffado-tools" +VERSION="2.4.8" +CATEGORY="multimedia" +SHORT_DESC="FFADO debugging and firmware tools." +MAINTAINER="maintainer@slitaz.org" +LICENSE="GPL2" +WEB_SITE="https://www.ffado.org/" + +WANTED="libffado" +DEPENDS="libffado libdbus-c++" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin $fs/usr/lib + cp -a $install/usr/bin/ffado* $fs/usr/bin + cp -a $install/usr/lib/libffado $fs/usr/lib +} diff -r 24024e28a27b -r 0d41479b7e7f libconfig/receipt --- a/libconfig/receipt Mon Sep 23 14:15:08 2024 +0000 +++ b/libconfig/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -24,12 +24,13 @@ # Rules to configure and make the package. compile_rules() { + # --disable-cxx, libconfig++ need for libffado + autoreconf && ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ --mandir=/usr/share/man \ - --disable-cxx \ --disable-doc \ $CONFIGURE_ARGS && make && diff -r 24024e28a27b -r 0d41479b7e7f libdbus-c++/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libdbus-c++/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="libdbus-c++" +VERSION="0.9.0" +CATEGORY="x-window" +SHORT_DESC="A C++ API for D-BUS." +MAINTAINER="maintainer@slitaz.org" +LICENSE="LGPL2" +WEB_SITE="https://sourceforge.net/projects/dbus-cplusplus/" +WANTED="dbus-c++" +DEPENDS="dbus glib" + +HOST_ARCH="i486 x86_64" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + cp -a $install/usr/lib/*.so* $fs/usr/lib +} diff -r 24024e28a27b -r 0d41479b7e7f libffado/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libffado/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,48 @@ +# SliTaz package receipt. + +PACKAGE="libffado" +VERSION="2.4.8" +CATEGORY="multimedia" +SHORT_DESC="Driver for FireWire audio devices." +MAINTAINER="maintainer@slitaz.org" +LICENSE="GPL2" +WEB_SITE="https://www.ffado.org/" +TARBALL="$PACKAGE-$VERSION.tgz" +WGET_URL="$WEB_SITE/files/$TARBALL" + +DEPENDS="libraw1394 libconfig libxml3++ libiec61883" +BUILD_DEPENDS="scons dbus-python-dev dbus-dev gcc83 \ +dbus-c++-dev libraw1394-dev libconfig-dev alsa-lib-dev \ +libiec61883-dev libxml3++-dev jack-audio-connection-kit-dev" + +# Rules to configure and make the package. +compile_rules() +{ + case "$ARCH" in + i?86) + arch=i386 ;; + x86_64) + arch=x86_64 ;; + esac + + export CC=gcc-83 CXX=g++-83 + # Disable CXX11_ABI, ensure work with glib that build without gcc83 + # see https://github.com/Beep6581/RawTherapee/issues/3024 + export CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" + + scons \ + CUSTOM_ENV=True \ + DIST_TARGET=$arch \ + DETECT_USERSPACE_ENV=False \ + PREFIX=/usr \ + DEBUG=no + + scons DESTDIR=$install install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + cp -a $install/usr/lib/*.so* $fs/usr/lib +} diff -r 24024e28a27b -r 0d41479b7e7f libxml3++-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libxml3++-dev/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,25 @@ +# SliTaz package receipt. + +PACKAGE="libxml3++-dev" +VERSION="3.0.1" +CATEGORY="development" +SHORT_DESC="libxml++ C++ wrapper devel files." +MAINTAINER="pankso@slitaz.org" +LICENSE="LGPL2.1" +WANTED="libxml3++" +WEB_SITE="https://sourceforge.net/projects/libxmlplusplus/" + +DEPENDS="glib-dev glibmm-dev libsigc++-dev libxml2-dev libxml++ zlib-dev \ +gcc-lib-base pkg-config" + +HOST_ARCH="i486 x86_64" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib $fs/usr/share + cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cp -a $install/usr/lib/libxml++-3.0 $fs/usr/lib + cp -a $install/usr/include $fs/usr +} + diff -r 24024e28a27b -r 0d41479b7e7f libxml3++/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libxml3++/receipt Mon Sep 23 18:13:10 2024 +0200 @@ -0,0 +1,54 @@ +# SliTaz package receipt. + +PACKAGE="libxml3++" +SOURCE="libxml++" +VERSION="3.0.1" +CATEGORY="system-tools" +SHORT_DESC="C++ wrapper for the libxml XML parser library." +MAINTAINER="pankso@slitaz.org" +LICENSE="LGPL2.1" +TARBALL="$SOURCE-$VERSION.tar.xz" +WEB_SITE="https://sourceforge.net/projects/libxmlplusplus/" +WGET_URL="$GNOME_MIRROR/$SOURCE/${VERSION%.*}/$TARBALL" + +DEPENDS="glibmm libsigc++ libxml2 zlib gcc83-lib-base" +BUILD_DEPENDS="gcc83 glibmm-dev libsigc++-dev libxml2-dev \ +zlib-dev mm-common pkg-config" + +HOST_ARCH="i486 x86_64" + +# What is the latest version available today? +current_version() +{ + wget -O - $(dirname $WGET_URL) 2>/dev/null | \ + sed "/$PACKAGE-[0-9]/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q +} + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + + # Allow build with gcc > 6. + # See https://svnweb.freebsd.org/ports?view=revision&revision=431411 + #patch -p1 < $stuff/build_with_gcc6.patch + + # Disable CXX11_ABI, ensure work with glib that build without gcc83 + # see https://github.com/Beep6581/RawTherapee/issues/3024 + export CXXFLAGS="$CXXFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" + + ./configure --prefix=/usr \ + CC=gcc-83 \ + CXX=g++-83 \ + --disable-documentation \ + $CONFIGURE_ARGS && + make && + make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + cp -a $install/usr/lib/*.so* $fs/usr/lib +}