audiodef
11 months ago
parent
79b7d5a8b0
commit
894322d68c
@ -1,3 +1,10 @@
|
||||
EBUILD ladish-1.9999.ebuild 1522 BLAKE2B d7af0112ebe473dee415b490bd34ec670d5334fc25c06e6499c2a91940f019c885770d09d7d06ed7bf867e669d75dee1859c29d31773ef80cef2f34d6005cc75 SHA512 f6d86d75e2743b238c5151090989ba07b4c4ad3b0b5a1233f70c2056d48792a5b4ba6047baa1e34557202cf989f6e65347e75d3a28e88e3e3acf51d222e87796
|
||||
EBUILD ladish-9999.ebuild 1508 BLAKE2B 5013c70bca6bfb6c99081abcb1bfb5b95d7c2495258c63723d8e60eb0ce15978cac0c6e06d95d7db85ad3fa6929e78658f12fb181bb17f6015882a0022c1d3ba SHA512 53dfb6dd254912137a059b967f7fd3bebcd8704e968416a98a48b07e0b7a31600f30f1b09c8720337e2eab68078f80c4c1e85fc5c6b79fb4afae2c3408ecded1
|
||||
MISC metadata.xml 244 BLAKE2B 37aa2c1a536a15131e73d4f57c6bb0b6f255fd3ef09e87a8730bebc44939e37ea3f23c2e25ec557bdf74fd81931a631fd58768e589c550e850bfb5266d1d3491 SHA512 b7663c21a0f41950109d0fe51ca1ea258313beef0a2be54cf3bf3d4f3bda9b0bff22da7a0fec0b477d44062892dd0e58c605e3bd2a2b8057de9eb8e95da8e6eb
|
||||
AUX ladish-1-add-includes-for-getrlimit.patch 611 BLAKE2B 7e93c8cbd218cddcf06cd9f701240366f0d1f83e463025c0d2aa590c86f1684f78c7b48e3ee42dd8b9e95155f65ebbd7e2f93446079b8a7e3a2a216326bcd739 SHA512 b0d77bc2c4d0a0c4f5cc6a19a12ec1c19bfe09703195f863f11632b2795e5fc128f6fe4b5174dd56a5e91f2e4c61ef5a2939eac6b98cec74b899553593920c0a
|
||||
AUX ladish-1-configure-libdir.patch 1114 BLAKE2B 576768236b361e4e5ba1c0964e72df8d50e25f08993464244ac735d0b5961625961d113d5cbaadf2a0cbb6c2b30c66e6c609933e93f1ec7ede15e09d4ab9dcec SHA512 964cd77a1cfb8630759b38f5d0d6ab725e2125bbb723b0c6168721c89e7262b53cc4f6e5a3845aea4ca56dace35a33f2e8f81b95cc5e51e0a9d63807bc019dce
|
||||
AUX ladish-1-disable-gladish.patch 1578 BLAKE2B 22d30a06df33080fe5abdbd1e3bc0286da869467b4823539ff47010a81b3c85bdb075599588a8bcb5a39ae46747a665d94ea95bd85c496f0aabbe9b2cb2bbd04 SHA512 23d8f6eb06de8df79265e8824020128fdffa67fd339f82e299e465082388b75ccf22c7823999d3bb267e19fa621adff82e9faa8da8c44854baa028cde33cbcd7
|
||||
AUX ladish-1-python3.patch 5859 BLAKE2B effaa0ff94c34b126d908723482194129f03f28c417b5dab6ff46668dc73590be888152823192954a083515f1fc6694e10250197669e8f4b465e4591cb4237fa SHA512 3c5e37fe1d1f172698a1a718a1e51f1d4ac9fd6ce80f532c80f5d6c6f453f4643d77172320a6f8c945bcbb4da0829c37e0bb03fbe01002faf267b9d8f91f7c3f
|
||||
AUX ladish-9999-disable-gladish.patch 1576 BLAKE2B 1da27568044a5b0834c41ff29c2c8ad646d366da882cd0c93e7f5af6f06adad0a7708a4f04a562feaca19b8e3dcac05a065f3a233f98e34db59573dc0d818caa SHA512 48a7a4d705c71794da7bf8d37332cd6310b8f7896aefddb622fbdc8458a6cc061552700259f8f6a73bd97a9db7fe5b36cab34fb3ac725dbc17a00043e456db7f
|
||||
DIST ladish-1-waf-2.0.22 106401 BLAKE2B 5d2919c55aec971b01ac1a2b30db805e05cb150cc694989e195cc498190a6a4b49d19d52c2e76c9d3261a555a7119fba8116a2d5f4a903767f4b41fd855308a0 SHA512 e5e2f5cef4fbfdda46515afc978a27bf8550a16e166a1083550dcc4aad0dd44f10225467aba2de4f5dba44f4cd50322cf556aa0242af4ebc8d26d0de5195fcb2
|
||||
DIST ladish-1.tar.gz 686288 BLAKE2B 7a3a39cf259ef57232dda50664dc4d9c57ae6f8e501d03a2d286e00451c2f99ba3130492e36132b127a868461c6a1518286d721224610060752fa5eb0b9b4cc1 SHA512 b01e24cd79c2711139c9d46c9bff4687049c3a735562a7f48a387103eec25c0222e935b90fb4eb2d3fc24629e417dab0c5aac215cbbca659ac49a2e802d1fd10
|
||||
EBUILD ladish-1-r2.ebuild 1723 BLAKE2B 73f07e297128f5348a81c83ad315bfc730e05acf0de883ee5611c20222fd9f1e7fe4fb0d6cb911b4a17db953fa3c48edb15b8aac1c52b66bd5c84841eecf03fb SHA512 fdf3c3de04e3072f807e0f3a2b4a8900761394b2ae4e64cccb74f336f4056e08b911819aaf216d1bd1bef5439a885dcaa8d957a7102c6120d207b3e7a3410ec9
|
||||
EBUILD ladish-9999.ebuild 1482 BLAKE2B db394f04bcefc017eee32a73e5abfba8fe976982f57699c86236afd911be1a6be955cea36ed3b3b7a16fe7f9ab200f8fd0be15601cdda0f08a47128b95e0d0aa SHA512 7b81de31e4bc9fdbf7242b0ee590b15f7eb2ec410c48c6e5fbec5d2e4dcaa3cc6380cabb70971a8ec8fa19d1e82f4a283ffaedfd14e3ee82926988f146e65917
|
||||
MISC metadata.xml 396 BLAKE2B fbf3c7a24fd769b165183617ab4aa9a6913838873a6311549ea56780082e173f42c3739eb440aa75b4c98838a6e05c26c070948aaa7bca99bc8063c9934913ac SHA512 1283221c2a0aa7017c5268f88d2810e38f1d27a4a85235df8f90c73c64377a505bac73515f460fb7f950a1605f127e5e0412a7a91a8796944d555b874e74d4d6
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From a2a17cd39220e2013d3402b06a53f5a46492aa00 Mon Sep 17 00:00:00 2001
|
||||
From: Nedko Arnaudov <nedko@arnaudov.name>
|
||||
Date: Sun, 7 Oct 2012 14:06:04 +0300
|
||||
Subject: [PATCH] add includes for getrlimit
|
||||
|
||||
---
|
||||
daemon/loader.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/daemon/loader.c b/daemon/loader.c
|
||||
index b9fe6f1c..37fb94fa 100644
|
||||
--- a/daemon/loader.c
|
||||
+++ b/daemon/loader.c
|
||||
@@ -34,6 +34,8 @@
|
||||
#include <fcntl.h>
|
||||
#include <pty.h> /* forkpty() */
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/time.h>
|
||||
+#include <sys/resource.h>
|
||||
|
||||
#include "loader.h"
|
||||
#include "../proxies/conf_proxy.h"
|
||||
--
|
||||
2.13.0
|
||||
@ -0,0 +1,23 @@
|
||||
diff --git a/wscript b/wscript
|
||||
index 333522e9..a7594716 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -54,6 +54,7 @@ def options(opt):
|
||||
opt.add_option('--distname', type='string', default=None, help="Name for the distribution tarball")
|
||||
opt.add_option('--distsuffix', type='string', default="", help="String to append to the distribution tarball name")
|
||||
opt.add_option('--tagdist', action='store_true', default=False, help='Create of git tag for distname')
|
||||
+ opt.add_option('--libdir', type='string', default=None, help='Define lib dir')
|
||||
if parallel_debug:
|
||||
opt.load('parallel_debug')
|
||||
|
||||
@@ -132,7 +133,10 @@ def configure(conf):
|
||||
else:
|
||||
conf.env['DBUS_SERVICES_DIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'share', 'dbus-1', 'services')
|
||||
|
||||
- conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
|
||||
+ if Options.options.libdir:
|
||||
+ conf.env['LIBDIR'] = Options.options.libdir
|
||||
+ else:
|
||||
+ conf.env['LIBDIR'] = os.path.join(os.path.normpath(conf.env['PREFIX']), 'lib')
|
||||
|
||||
conf.env['BUILD_DOXYGEN_DOCS'] = Options.options.doxygen
|
||||
@ -0,0 +1,46 @@
|
||||
From edbef85f6334e8dcffcaf3492e95bca8c4fe0f51 Mon Sep 17 00:00:00 2001
|
||||
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
|
||||
Date: Sun, 28 Feb 2021 12:07:37 +0100
|
||||
Subject: [PATCH] Disable gladish
|
||||
|
||||
---
|
||||
wscript | 17 +----------------
|
||||
1 file changed, 1 insertion(+), 16 deletions(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 5dedddf1..ff5a804c 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -148,7 +148,7 @@ def configure(conf):
|
||||
|
||||
conf.env['LIB_EXPAT'] = ['expat']
|
||||
|
||||
- build_gui = True
|
||||
+ build_gui = False
|
||||
|
||||
if build_gui and not conf.check_cfg(
|
||||
package = 'glib-2.0',
|
||||
@@ -594,21 +594,6 @@ def build(bld):
|
||||
|
||||
bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755)
|
||||
|
||||
- # 'Desktop' file (menu entry, icon, etc)
|
||||
- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644)
|
||||
-
|
||||
- # Icons
|
||||
- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
|
||||
- for icon_size in icon_sizes:
|
||||
- bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
|
||||
- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
|
||||
-
|
||||
- status_images = []
|
||||
- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
|
||||
- status_images.append("art/status_" + status + ".png")
|
||||
-
|
||||
- bld.install_files('${DATA_DIR}', status_images)
|
||||
- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
|
||||
bld.install_files('${DATA_DIR}', ["AUTHORS", "README", "NEWS"])
|
||||
bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt")
|
||||
|
||||
--
|
||||
2.26.2
|
||||
@ -0,0 +1,159 @@
|
||||
From 2a2c3a50dec5a39742e74804a9caba8fd9cf3c8a Mon Sep 17 00:00:00 2001
|
||||
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
|
||||
Date: Sun, 28 Feb 2021 11:59:02 +0100
|
||||
Subject: [PATCH] Fix Python 3 compatibility
|
||||
|
||||
Uses parts of the patch from the openSUSE package https://build.opensuse.org/package/show/multimedia:apps/ladish
|
||||
---
|
||||
ladish_control | 2 +-
|
||||
wscript | 49 ++++++++++++++++++++++++-------------------------
|
||||
2 files changed, 25 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/ladish_control b/ladish_control
|
||||
index 4303f70b..3f5f8a96 100755
|
||||
--- a/ladish_control
|
||||
+++ b/ladish_control
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# LADI Session Handler (ladish)
|
||||
#
|
||||
diff --git a/wscript b/wscript
|
||||
index 296a8522..5dedddf1 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -1,13 +1,8 @@
|
||||
#! /usr/bin/env python
|
||||
# encoding: utf-8
|
||||
|
||||
-import os
|
||||
-import Options
|
||||
-import Utils
|
||||
-import shutil
|
||||
-import re
|
||||
-import waflib
|
||||
-from waflib.Scripting import Dist
|
||||
+from __future__ import with_statement
|
||||
+
|
||||
|
||||
parallel_debug = False
|
||||
|
||||
@@ -20,19 +15,23 @@ RELEASE = True
|
||||
top = '.'
|
||||
out = 'build'
|
||||
|
||||
-from Logs import pprint
|
||||
+import os, sys, re, io, optparse, shutil, tokenize
|
||||
+from hashlib import md5
|
||||
+
|
||||
+from waflib import Errors, Utils, Options, Logs, Scripting
|
||||
+from waflib import Configure
|
||||
|
||||
def display_msg(conf, msg="", status = None, color = None):
|
||||
if status:
|
||||
conf.msg(msg, status, color)
|
||||
else:
|
||||
- pprint('NORMAL', msg)
|
||||
+ Logs.pprint('NORMAL', msg)
|
||||
|
||||
def display_raw_text(conf, text, color = 'NORMAL'):
|
||||
- pprint(color, text, sep = '')
|
||||
+ Logs.pprint(color, text, sep = '')
|
||||
|
||||
def display_line(conf, text, color = 'NORMAL'):
|
||||
- pprint(color, text, sep = os.linesep)
|
||||
+ Logs.pprint(color, text, sep = os.linesep)
|
||||
|
||||
def yesno(bool):
|
||||
if bool:
|
||||
@@ -216,10 +215,10 @@ def configure(conf):
|
||||
#print "optimize force enable is required"
|
||||
if not check_gcc_optimizations_enabled(conf.env['CFLAGS']):
|
||||
if Options.options.debug:
|
||||
- print "C optimization must be forced in order to enable -Wuninitialized"
|
||||
- print "However this will not be made because debug compilation is enabled"
|
||||
+ print ("C optimization must be forced in order to enable -Wuninitialized")
|
||||
+ print ("However this will not be made because debug compilation is enabled")
|
||||
else:
|
||||
- print "C optimization forced in order to enable -Wuninitialized"
|
||||
+ print ("C optimization forced in order to enable -Wuninitialized")
|
||||
conf.env.append_unique('CFLAGS', "-O")
|
||||
except:
|
||||
pass
|
||||
@@ -249,7 +248,7 @@ def configure(conf):
|
||||
version_msg = APPNAME + "-" + VERSION
|
||||
|
||||
if os.access('version.h', os.R_OK):
|
||||
- data = file('version.h').read()
|
||||
+ data = open('version.h').read()
|
||||
m = re.match(r'^#define GIT_VERSION "([^"]*)"$', data)
|
||||
if m != None:
|
||||
version_msg += " exported from " + m.group(1)
|
||||
@@ -295,11 +294,11 @@ def git_ver(self):
|
||||
if os.access('./version.h', os.R_OK):
|
||||
header = os.path.join(os.getcwd(), out, "version.h")
|
||||
shutil.copy('./version.h', header)
|
||||
- data = file(header).read()
|
||||
+ data = open(header).read()
|
||||
m = re.match(r'^#define GIT_VERSION "([^"]*)"$', data)
|
||||
if m != None:
|
||||
self.ver = m.group(1)
|
||||
- pprint('BLUE', "tarball from git revision " + self.ver)
|
||||
+ Logs.pprint('BLUE', "tarball from git revision " + self.ver)
|
||||
else:
|
||||
self.ver = "tarball"
|
||||
return
|
||||
@@ -309,7 +308,7 @@ def git_ver(self):
|
||||
if bld.cmd_and_log("LANG= git diff-index --name-only HEAD", quiet=waflib.Context.BOTH).splitlines():
|
||||
self.ver += "-dirty"
|
||||
|
||||
- pprint('BLUE', "git revision " + self.ver)
|
||||
+ Logs.pprint('BLUE', "git revision " + self.ver)
|
||||
else:
|
||||
self.ver = "unknown"
|
||||
|
||||
@@ -592,11 +591,11 @@ def build(bld):
|
||||
|
||||
# GtkBuilder UI definitions (XML)
|
||||
bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
|
||||
-
|
||||
- bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
|
||||
+
|
||||
+ bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755)
|
||||
|
||||
# 'Desktop' file (menu entry, icon, etc)
|
||||
- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
|
||||
+ bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644)
|
||||
|
||||
# Icons
|
||||
icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
|
||||
@@ -617,14 +616,14 @@ def build(bld):
|
||||
html_docs_source_dir = "build/default/html"
|
||||
if bld.cmd == 'clean':
|
||||
if os.access(html_docs_source_dir, os.R_OK):
|
||||
- pprint('CYAN', "Removing doxygen generated documentation...")
|
||||
+ Logs.pprint('CYAN', "Removing doxygen generated documentation...")
|
||||
shutil.rmtree(html_docs_source_dir)
|
||||
- pprint('CYAN', "Removing doxygen generated documentation done.")
|
||||
+ Logs.pprint('CYAN', "Removing doxygen generated documentation done.")
|
||||
elif bld.cmd == 'build':
|
||||
if not os.access(html_docs_source_dir, os.R_OK):
|
||||
os.popen("doxygen").read()
|
||||
else:
|
||||
- pprint('CYAN', "doxygen documentation already built.")
|
||||
+ Logs.pprint('CYAN', "doxygen documentation already built.")
|
||||
|
||||
bld(features='intltool_po', appname=APPNAME, podir='po', install_path="${LOCALE_DIR}")
|
||||
|
||||
@@ -657,7 +656,7 @@ def etags(ctx):
|
||||
os.system(cmd)
|
||||
os.system("stat -c '%y' TAGS")
|
||||
|
||||
-class ladish_dist(waflib.Scripting.Dist):
|
||||
+class ladish_dist(Scripting.Dist):
|
||||
cmd = 'dist'
|
||||
fun = 'dist'
|
||||
|
||||
--
|
||||
2.26.2
|
||||
@ -0,0 +1,46 @@
|
||||
From 8e9214859af07e6c13827d79e4f12e21386dcbd2 Mon Sep 17 00:00:00 2001
|
||||
From: Simon van der Veldt <simon.vanderveldt@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 13:28:40 +0100
|
||||
Subject: [PATCH] Disable gladish
|
||||
|
||||
---
|
||||
wscript | 17 +----------------
|
||||
1 file changed, 1 insertion(+), 16 deletions(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 0ea49c44..bc3817e8 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -161,7 +161,7 @@ def configure(conf):
|
||||
|
||||
conf.env['LIB_EXPAT'] = ['expat']
|
||||
|
||||
- build_gui = True
|
||||
+ build_gui = False
|
||||
|
||||
if build_gui and not conf.check_cfg(
|
||||
package = 'glib-2.0',
|
||||
@@ -648,21 +648,6 @@ def build(bld):
|
||||
|
||||
bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o0755)
|
||||
|
||||
- # 'Desktop' file (menu entry, icon, etc)
|
||||
- bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o0644)
|
||||
-
|
||||
- # Icons
|
||||
- icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
|
||||
- for icon_size in icon_sizes:
|
||||
- bld.path.ant_glob('art/' + icon_size + '/apps/*.png')
|
||||
- bld.install_files('${PREFIX}/share/icons/hicolor/' + icon_size + '/apps/', 'art/' + icon_size + '/apps/gladish.png')
|
||||
-
|
||||
- status_images = []
|
||||
- for status in ["down", "unloaded", "started", "stopped", "warning", "error"]:
|
||||
- status_images.append("art/status_" + status + ".png")
|
||||
-
|
||||
- bld.install_files('${DATA_DIR}', status_images)
|
||||
- bld.install_files('${DATA_DIR}', "art/ladish-logo-128x128.png")
|
||||
bld.install_files('${DOCDIR}', ["AUTHORS", "README", "NEWS"])
|
||||
bld.install_as('${DATA_DIR}/COPYING', "gpl2.txt")
|
||||
|
||||
--
|
||||
2.26.2
|
||||
Loading…
Reference in new issue