Compare commits

...

54 Commits

Author SHA1 Message Date
ktrace f1b4231342 Merged with fast-fix
20 hours ago
Victor Kustov 359cb22ff6
app-i18n/weblate-cli: forget ebuild fix
20 hours ago
ktrace 2d1ecd823a Merged with weblate-cli
20 hours ago
Victor Kustov 0eec512598
app-i18n/weblate-cli: up to 1.15, drop old
20 hours ago
ktrace d93ff27b61 Merged with fixes
21 hours ago
Victor Kustov b9891d8091
update README.md
21 hours ago
ktrace 0865d402e7 Merged with fixes
22 hours ago
Victor Kustov e1a79f7f6d
fixes
22 hours ago
ktrace f8c25d2fc1 Merged with claws-patches
22 hours ago
Victor Kustov b61d6d3dc5
mail-client/claws-mail: get 4.3.0 and patch
22 hours ago
ktrace 43d022c650 Merged with qxgedit-1.0.0
23 hours ago
Victor Kustov 1a05307c0d
media-sound/qxgedit: up to 1.0.0, drop old
23 hours ago
ktrace 09267b530e Merged with clean
23 hours ago
Victor Kustov c9f56fabca
dev-lang/regina-rexx
23 hours ago
ktrace fda41e70d3 Merged with clean
1 day ago
Victor Kustov 071f97eb77
net-libs/ccrtp: fix moved doxygen, clean
1 day ago
Victor Kustov 079a39e7d4
dev-libs/ucommon: fix moved doxygen
1 day ago
Victor Kustov 6030278537
dev-lang/regina-rexx: up to 3.9.6, clean
1 day ago
ktrace 15e591c9ac Merged with ci
1 day ago
ktrace 9d7608f625 Обновлен файл gitflic-ci.yaml
2 months ago
ktrace c78a6e6aa0 Обновлен файл gitflic-ci.yaml
2 months ago
ktrace 01a6551862 Обновлен файл gitflic-ci.yaml
2 months ago
Victor Kustov 8f7cd4d8b2
media-sound/qxgedit: up to 1.0.0
3 months ago
ktrace 63fa71c2cc Merged with ci
3 months ago
Victor Kustov 2cdd7f6332
init
3 months ago
ktrace a5d56059ea Merge pull request 'media-sound/qxgedit: up to 0.9.90' (#12) from qxge into main
5 months ago
Victor Kustov a871e4d783
media-sound/qxgedit: up to 0.9.90
5 months ago
ktrace 4b11860a56 Merge pull request 'app-i18n/weblate-cli: up to 1.14, up python 11/12' (#11) from weblate-cli-1.15 into main
7 months ago
Victor Kustov d4015fa5b9
app-i18n/weblate-cli: up to 1.14, up python 11/12
7 months ago
ktrace 48e59494f4 Merge pull request 'media-sound/qxgedit: up to 0.9.12' (#10) from qxgedit-0.9.12 into main
7 months ago
Victor Kustov b1f40b83f3
media-sound/qxgedit: up to 0.9.12
7 months ago
Victor Kustov 6283129a62
media-sound/qxgedit: remove old
10 months ago
ktrace 78fd50c815 Merge pull request 'net-print/cndrvcups-capt: old Canon printers add' (#8) from capt into main
11 months ago
Victor Kustov a39a46a3f7
net-print/cndrvcups-capt: old Canon printers add
11 months ago
ktrace 25663c9b33 Merge pull request 'remove fheroes - in mainstream' (#6) from fheroes-remove into main
11 months ago
Victor Kustov 3585dd71cb
remove fheroes - in mainstream
11 months ago
ktrace 56c7cef00c Merge pull request 'games-engines/fheroes2: games-engines/fheroes2' (#5) from fh-1.0.9 into main
12 months ago
Victor Kustov 434497ab1d
games-engines/fheroes2: games-engines/fheroes2
12 months ago
ktrace 1a502205c6 Merge pull request 'media-sound/qxgedit: up to 0.9.10' (#4) from qxgedit into main
1 year ago
Victor Kustov 5baf1e4aa8
media-sound/qxgedit: up to 0.9.10
1 year ago
ktrace 59090ac2d9 Merge pull request 'games-engines/fheroes2: up to 1.0.8' (#3) from fh-1.0.8 into main
1 year ago
Victor Kustov 0fe09bc550
games-engines/fheroes2: up to 1.0.8
1 year ago
ktrace e1814f3e11 Merge pull request 'games-engines/fheroes2: add forgotten ebuild' (#2) from fh-1.0.6 into main
1 year ago
Victor Kustov dc75361b21
ap fh
1 year ago
ktrace 2e447aaab5 Merge pull request 'games-engines/fheroes2: up to 1.0.6' (#1) from fh-1.0.6 into main
1 year ago
Victor Kustov aa33c5978c
games-engines/fheroes2: up to 1.0.6
1 year ago
ktrace f1ca25b65e Изменил(а) на 'README.md'
1 year ago
ktrace eb2e8832b7 Изменил(а) на 'README.md'
1 year ago
Victor Kustov 1498b6c185 games-engines/fheroes2: up to 1.0.5, drop 1.0.3
1 year ago
Victor Kustov b9bf1b4b3d
readme
1 year ago
Victor Kustov 711bbe8378
app-i18n/weblate-cli: drop old python
1 year ago
Victor Kustov 71d2bcfa60
dev-lang/regina-rexx: get dropped from mainline
1 year ago
Victor Kustov e7176872dd games-engines/fheroes2: up to 1.0.4
1 year ago
Victor Kustov d560e8a4ca
files/twinkle: fixes
1 year ago

@ -1,4 +1,4 @@
# redhub-stuff-overlay
# redhub-common
Gentoo overlay for different programs.
Create issue when you need add apps, or if you found a bug. Pull requests are welcome.
Best ebuilds for best and most useful apps will move in main tree.
@ -7,7 +7,7 @@ ADDED:
- twinkle
- Weblate client (CLI)
- zrtp for twinkle
- fheroes2 game engine
- Regina-REXX
TODO:
- Weblate server
@ -21,6 +21,8 @@ TODO:
How to use:
1. Make sure you have installed package app-eselect/eselect-repository;
2. Add custom repository: ```eselect repository add redhub-stuff git https://github.com/ktrace/redhub-stuff-overlay.git```
2. Add custom repository: ```eselect repository add redhub-common git https://gitflic.ru/project/redhub/redhub-common.git```
or mirror: ```eselect repository add redhub-common git https://git.calculate-linux.org/ktrace/redhub-common.git```
or mirror: ```eselect repository add redhub-common git https://github.com/ktrace/redhub-stuff-overlay.git```
3. Sync and update eix cache. Gentoo users may do ```eix-sync && eix-update```, Calculate Linux users must do ```emerge --sync && eix-update```.
4. Check result by run ```eix twinkle```, your must see twinkle package and redhub-stuff overlay.

@ -1 +1,2 @@
DIST weblate-cli-1.13.tar.gz 70344 BLAKE2B 2f93435b23bdb98f45fbb6c5e1f246d22d75316a61daad39872110632453b7692576e882834362b194d483bcfefd5b5dcdf407bb70dc9ece20a8fcd34185abe3 SHA512 a6de0a1f6e6298d980341bf9e3801a9ba310efe0c70105a8cc561552f778f2c4a8bd5d6c77c8d7588e709dc28129ee258f977785fe0eff916616c682f3d6cb32
DIST weblate-cli-1.14.tar.gz 85423 BLAKE2B 8ed22cbc926a2a27b9758627c3a63de5839d449aeec6e7afa1e05098e56c4eb0949934fce1bec157f4672c65667fd22f9c95c41fa3d1f3d5826b56100f947e4d SHA512 081c0758275922a31fa2ec1dea300296b2cd0882339672717b57504ef5fb6713b01c4b4d8f2765e75a4455b5b0d07e54a551045360b666a4923957579a8a2472
DIST weblate-cli-1.15.tar.gz 85344 BLAKE2B 7e20fb4be536c05439c21b9144f09bba8bcc90eba1c7530beae45599510deb1edcafcfb6cb8c794980654ba8aac1c78fccbb1088ff08706a94eaf3ca7ab3e97a SHA512 9d806ada4db9fcba745abfb07e0562ad7d5f0e3644748c2f13f0ada1477a00b057e834cc89ffab9dc8930587a8333e07a0d9d469d15e34afd7e3cc6e1f71a09c

@ -3,7 +3,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9,10,11} )
PYTHON_COMPAT=( python3_{11..13} )
inherit distutils-r1
@ -11,12 +11,12 @@ DESCRIPTION="Weblate commandline client using Weblate's REST API."
HOMEPAGE="https://weblate.org"
SRC_URI="https://github.com/WeblateOrg/wlc/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/wlc-${PV}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
PATCHES=( "${FILESDIR}/01-fix-python-warnings.patch" )
COMMON_DEPEND="
dev-python/argcomplete
dev-python/python-dateutil
@ -29,7 +29,6 @@ DEPEND="
RDEPEND="
${COMMON_DEPEND}
"
S="${WORKDIR}/wlc-${PV}"
python_test() {
py.test -v

@ -0,0 +1,36 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..13} )
inherit distutils-r1
DESCRIPTION="Weblate commandline client using Weblate's REST API."
HOMEPAGE="https://weblate.org"
SRC_URI="https://github.com/WeblateOrg/wlc/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/wlc-${PV}"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
dev-python/argcomplete
dev-python/python-dateutil
dev-python/pyxdg
dev-python/requests
dev-python/urllib3"
DEPEND="
${COMMON_DEPEND}
"
RDEPEND="
${COMMON_DEPEND}
"
python_test() {
py.test -v
}

@ -0,0 +1 @@
DIST regina-rexx-3.9.6.tar.gz 2705800 BLAKE2B d869f9285e0fa0810b690d97932059aa6d3aaf0d99355bad18ffd480cc322a076928d08fce03893124a0ebd330a55ac9b6c580657e92601d8204a2a0b3c15406 SHA512 17f02afea59daa994f4ff1499914b80ed8da8109237e02ed18ab9194e532427f2f7f724be0e3345ca133e19a0501f7457f6248caf5de2ab158d17cb0e996db6a

@ -0,0 +1,98 @@
diff --git a/Makefile.in b/Makefile.in
index 17e43da..ff7167d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,7 +323,7 @@ JUNK = *.o *.so.$(OBJ) $(STATICLIB) execiser$(binarybitprefix)$(EXE) threader$(b
#
.SUFFIXES:
-all : rexx$(binarybitprefix)$(EXE) $(STATICLIB) execiser$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(THREADSAFE_TARGET) rxstack$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) $(MTBFILES)
+all : rexx$(binarybitprefix)$(EXE) execiser$(binarybitprefix)$(EXE) $(SHL_TARGETS) $(THREADSAFE_TARGET) rxstack$(binarybitprefix)$(EXE) rxqueue$(binarybitprefix)$(EXE) $(MTBFILES)
$(srcdir)/rexx.h : $(srcdir)/extern.h $(srcdir)/strengs.h $(srcdir)/defs.h $(srcdir)/regina_t.h $(srcdir)/mt.h
@@ -1053,24 +1053,17 @@ installbase: all
$(INSTALL) -m 755 -d $(DESTDIR)$(examplesdir)
$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
- $(INSTALL) -s -m 755 -c ./rexx$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE)
- $(INSTALL) -s -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE)
- $(INSTALL) -s -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE)
+ $(INSTALL) -m 755 -c ./rexx$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rexx$(binarybitprefix)$(EXE)
+ $(INSTALL) -m 755 -c ./rxqueue$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxqueue$(binarybitprefix)$(EXE)
+ $(INSTALL) -m 755 -c ./rxstack$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/rxstack$(binarybitprefix)$(EXE)
$(INSTALL) -m 644 -c $(srcdir)/rxstack.conf.etc $(DESTDIR)$(sysconfdir)/rxstack.conf
$(INSTALL) -m 755 -c ./regina-config $(DESTDIR)$(bindir)/regina-config
$(INSTALL) -m 755 -c ./libregina.pc $(DESTDIR)$(libdir)/pkgconfig/libregina.pc
- -$(INSTALL) -m 644 -c ./$(LIBPRE)$(LIBFILE)$(LIBPST) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
- -$(RANLIB) $(DESTDIR)$(libdir)/$(LIBPRE)$(LIBFILE)$(LIBPST)
$(INSTALL) -m 644 -c $(srcdir)/regina.1 $(DESTDIR)$(mandir)/man1/regina.1
$(INSTALL) -m 644 -c $(srcdir)/regina.1 $(DESTDIR)$(mandir)/man1/rexx.1
$(INSTALL) -m 644 -c $(srcdir)/regina-config.1 $(DESTDIR)$(mandir)/man1/regina-config.1
$(INSTALL) -m 644 -c $(srcdir)/rxstack.1 $(DESTDIR)$(mandir)/man1/rxstack.1
$(INSTALL) -m 644 -c $(srcdir)/rxqueue.1 $(DESTDIR)$(mandir)/man1/rxqueue.1
- gzip -f $(DESTDIR)$(mandir)/man1/regina.1
- gzip -f $(DESTDIR)$(mandir)/man1/rexx.1
- gzip -f $(DESTDIR)$(mandir)/man1/regina-config.1
- gzip -f $(DESTDIR)$(mandir)/man1/rxstack.1
- gzip -f $(DESTDIR)$(mandir)/man1/rxqueue.1
$(INSTALL) -m 644 -c $(srcdir)/rexxsaa.h $(DESTDIR)$(includedir)/rexxsaa.h
$(INSTALL) -m 644 -c ./en.mtb $(DESTDIR)$(sharedir)/en.mtb
$(INSTALL) -m 644 -c ./pt.mtb $(DESTDIR)$(sharedir)/pt.mtb
@@ -1092,7 +1085,7 @@ installdoc:
$(INSTALL) -m 644 -c ./doc/regutil.pdf $(DESTDIR)/$(PACKAGE)-regutil-$(VERDOTUNQUOTED)-doc.pdf
installregina:
- $(INSTALL) -s -m 755 -c ./regina$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/regina$(binarybitprefix)$(EXE)
+ $(INSTALL) -m 755 -c ./regina$(binarybitprefix)$(EXE) $(DESTDIR)$(bindir)/regina$(binarybitprefix)$(EXE)
$(INSTALL) -m 755 -c $(srcdir)/demo/dynfunc.rexx $(DESTDIR)$(examplesdir)/dynfunc.rexx
$(INSTALL) -m 755 -c $(srcdir)/regutil/regutil.rexx $(DESTDIR)$(examplesdir)/regutil.rexx
$(INSTALL) -m 755 -c $(srcdir)/regutil/getline.rexx $(DESTDIR)$(examplesdir)/getline.rexx
@@ -1104,10 +1097,10 @@ installlib: installregina
## $(INSTALL) -s -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)regutil$(MODPST)
## $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest1$(MODPST)
## $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)/$(SHLPRE)rxtest2$(MODPST)
- $(INSTALL) -s -m 755 -c ./$(SHL_NAME_REGINA) $(DESTDIR)$(libdir)/$(SHL_NAME_REGINA)
- $(INSTALL) -s -m 755 -c ./$(SHL_NAME_REGUTIL) $(DESTDIR)$(packagedir)/$(SHL_NAME_REGUTIL)
- $(INSTALL) -s -m 755 -c ./$(SHL_NAME_RXTEST1) $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST1)
- $(INSTALL) -s -m 755 -c ./$(SHL_NAME_RXTEST2) $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST2)
+ $(INSTALL) -m 755 -c ./$(SHL_NAME_REGINA) $(DESTDIR)$(libdir)/$(SHL_NAME_REGINA)
+ $(INSTALL) -m 755 -c ./$(SHL_NAME_REGUTIL) $(DESTDIR)$(packagedir)/$(SHL_NAME_REGUTIL)
+ $(INSTALL) -m 755 -c ./$(SHL_NAME_RXTEST1) $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST1)
+ $(INSTALL) -m 755 -c ./$(SHL_NAME_RXTEST2) $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST2)
# ln -sf $(DESTDIR)$(packagedir)/$(SHL_NAME_REGUTIL) $(DESTDIR)$(addonsdir)
# ln -sf $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST1) $(DESTDIR)$(addonsdir)
# ln -sf $(DESTDIR)$(packagedir)/$(SHL_NAME_RXTEST2) $(DESTDIR)$(addonsdir)
@@ -1122,15 +1115,15 @@ installlib: installregina
installabilib: installregina
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
$(INSTALL) -m 755 -d $(DESTDIR)$(addonsdir)
- -$(INSTALL) -s -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI)
+ -$(INSTALL) -m 755 -c ./$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI)
-rm -f $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR)
-(cd $(DESTDIR)$(libdir);$(LN_S) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR) )
-rm -f $(DESTDIR)$(libdir)/$(SHLPRE)$(SHLFILE)$(SHLPST)
-(cd $(DESTDIR)$(libdir);$(LN_S) $(SHLPRE)$(SHLFILE)$(SHLPST).$(ABI_MAJOR) $(SHLPRE)$(SHLFILE)$(SHLPST) )
- $(INSTALL) -s -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)regutil$(MODPST)
- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest1$(MODPST)
- $(INSTALL) -s -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest2$(MODPST)
+ $(INSTALL) -m 755 -c ./$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)regutil$(MODPST)
+ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest1$(MODPST)
+ $(INSTALL) -m 755 -c ./$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest2$(MODPST)
# ln -sf $(DESTDIR)$(packagedir)/$(SHLPRE)regutil$(MODPST) $(DESTDIR)$(addonsdir)
# ln -sf $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest1$(MODPST) $(DESTDIR)$(addonsdir)
# ln -sf $(DESTDIR)$(packagedir)/$(SHLPRE)rxtest2$(MODPST) $(DESTDIR)$(addonsdir)
diff --git a/configure.in b/configure.in
index bb424b9..12cf5e6 100644
--- a/configure.in
+++ b/configure.in
@@ -30,7 +30,7 @@ cp $srcdir/common/config.sub $srcdir
dnl ---------------------- check for C compiler -----------------
dnl Checks for one of the C compilers below - change if yours not there.
-MH_PROG_CC
+AC_PROG_CC
AC_CONFIG_HEADER(config.h)
AC_ISC_POSIX

@ -0,0 +1,14 @@
#!/sbin/openrc-run
start() {
ebegin "Starting Regina stack"
start-stop-daemon --start --pidfile /var/run/rxstack.pid \
--exec /usr/bin/rxstack -- -d
eend $?
}
stop() {
ebegin "Stopping Regina stack"
start-stop-daemon --stop --exec /usr/bin/rxstack
eend $?
}

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ktrace@yandex.ru</email>
<name>Victor Kustov</name>
</maintainer>
<longdescription lang="en">
Regina is a Rexx interpreter. Rexx is a programming language that was
designed to be easy to use for inexperienced programmers yet powerful
enough for experienced users. It is also a language ideally suited as a
macro language for other applications.
</longdescription>
<upstream>
<remote-id type="sourceforge">regina-rexx</remote-id>
<bugs-to>https://sourceforge.net/p/regina-rexx/bugs/</bugs-to>
</upstream>
</pkgmetadata>

@ -0,0 +1,46 @@
# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
DESCRIPTION="Portable Rexx interpreter"
HOMEPAGE="https://regina-rexx.sourceforge.io/"
SRC_URI="https://sourceforge.net/projects/regina-rexx/files/regina-rexx/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
#S="${WORKDIR}/Regina-REXX-${PV}"
LICENSE="LGPL-2.1 MPL-1.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="virtual/libcrypt:="
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
src_prepare() {
default
mv configure.{in,ac} || die
eautoconf
}
src_compile() {
emake -j1
}
src_install() {
emake -j1 DESTDIR="${D}" install
DOCS=( BUGS HACKERS.txt README.Unix README_SAFE TODO )
einstalldocs
newinitd "${FILESDIR}"/rxstack-r1 rxstack
}
pkg_postinst() {
elog "You may want to run"
elog
elog "\trc-update add rxstack default"
elog
elog "to enable Rexx queues (optional)."
}

@ -6,7 +6,7 @@ EAPI=8
inherit autotools flag-o-matic
DESCRIPTION="Portable C++ runtime for threads and sockets"
HOMEPAGE="https://www.gnu.org/software/commoncpp"
HOMEPAGE="https://www.gnu.org/software/commoncpp/"
SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
LICENSE="LGPL-3"
@ -22,7 +22,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )"
doc? ( app-text/doxygen )"
PATCHES=(
"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch

@ -1,2 +0,0 @@
DIST fheroes2-1.0.2.tar.gz 11230530 BLAKE2B d8e095789d3bc389bc71310f7dafdd6aea7f052ba538c80d71148c61206a0c36695b686ce00b379349c5777e026d32d6c2b6c34c11a02e83c4124c980f793027 SHA512 326d0c2085941696ea8c620a5111ca76271b6a992cc2d5eb986520ba1201a1e88a282712c079dac323677dc65a6c4ad14595d76e5f71a3bd2a40953b267c7c6b
DIST fheroes2-1.0.3.tar.gz 11448722 BLAKE2B 4a56eabd143d9da804a2e895e3f4357ef9ffd983a8db363a139e86391c655e70c669519e05fbc1ed0fca77260a699929ebfac302a82da2db4f6726eb2782a2b9 SHA512 c4cce2aed317c84dd742ae2394f442b53b4d524cd02989d2fcd69a23ed88dcba93dedcbe498255c4ffaafaaed149cfadbd9e52285e85bba778e38f27685835e0

@ -1,23 +0,0 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Recreation of the Heroes of Might and Magic II game engine"
HOMEPAGE="https://ihhub.github.io/fheroes2/"
SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
inherit cmake
DEPEND="media-libs/libpng
media-libs/libsdl2
media-libs/sdl2-image
media-libs/sdl2-mixer
sys-libs/zlib
"
RDEPEND="${DEPEND}"

@ -1,23 +0,0 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="Recreation of the Heroes of Might and Magic II game engine"
HOMEPAGE="https://ihhub.github.io/fheroes2/"
SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
inherit cmake
DEPEND="media-libs/libpng
media-libs/libsdl2
media-libs/sdl2-image
media-libs/sdl2-mixer
sys-libs/zlib
"
RDEPEND="${DEPEND}"

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream><remote-id type="github">ihhub/fheroes2</remote-id></upstream>
</pkgmetadata>

@ -0,0 +1,16 @@
stages:
- test
- build
build_job:
stage: build
script:
- echo "Building the project"
- git log -p > /tmp/build.gitlog
- git status > /tmp/build.gitstatus
test_job:
stage: test
script:
- echo "Running tests"
- git log -p > /tmp/test.gitlog
- git status > /tmp/test.gitstatus

@ -1 +1 @@
DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
DIST claws-mail-4.3.0.tar.xz 6831980 BLAKE2B e4dfb35b7f542ee514613b55286a19e2db398babc391a648edbda6d694b2e76973e1e7b6c4b7942b335898a571ffbbfef60fea1831ad4ac5ef7457a454259198 SHA512 3b0e811948d75ca2d003035d545d46d142ed4f2c1a103dc862413f9ff7a5ba612e00a7d5832836657e8d382bc7f94520496aaf60da429c72d9fb146ba12f0dfc

@ -1,37 +1,38 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_COMPAT=( python3_{10..13} )
inherit autotools desktop python-any-r1 xdg
inherit desktop python-single-r1 xdg
DESCRIPTION="An email client (and news reader) based on GTK+"
HOMEPAGE="https://www.claws-mail.org/"
LICENSE="GPL-3"
SLOT="0"
if [[ "${PV}" == *9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"
else
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
fi
SLOT="0"
QA_PKGCONFIG_VERSION="${PV}.0"
LICENSE="GPL-3"
IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
REQUIRED_USE="
libcanberra? ( notification )
libnotify? ( notification )
networkmanager? ( dbus )
oauth? ( gnutls )
python? ( ${PYTHON_REQUIRED_USE} )
smime? ( pgp )
"
COMMONDEPEND="
>=dev-libs/glib-2.50:2
dev-libs/nettle:=
net-mail/ytnef
sys-libs/zlib:=
@ -46,6 +47,7 @@ COMMONDEPEND="
)
bogofilter? ( mail-filter/bogofilter )
calendar? (
dev-lang/perl:=
>=dev-libs/libical-2.0.0:=
>=net-misc/curl-7.9.7
)
@ -53,26 +55,33 @@ COMMONDEPEND="
>=dev-libs/dbus-glib-0.60
sys-apps/dbus
)
gdata? ( >=dev-libs/libgdata-0.17.2 )
dillo? ( www-client/dillo )
gnutls? ( >=net-libs/gnutls-3.0 )
imap? ( >=net-libs/libetpan-0.57 )
ldap? ( >=net-nds/openldap-2.0.7:= )
litehtml? (
>=dev-libs/glib-2.36:2
>=dev-libs/gumbo-0.10
>=dev-libs/gumbo-0.10:=
net-misc/curl
media-libs/fontconfig
)
nls? ( >=sys-devel/gettext-0.18 )
nntp? ( >=net-libs/libetpan-0.57 )
notification? (
dev-libs/glib:2
libcanberra? ( media-libs/libcanberra[gtk3] )
libnotify? ( x11-libs/libnotify )
)
perl? ( dev-lang/perl:= )
pdf? ( app-text/poppler[cairo] )
pgp? ( >=app-crypt/gpgme-1.0.0:= )
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
')
)
rss? (
dev-libs/libxml2
net-misc/curl
)
session? (
x11-libs/libICE
x11-libs/libSM
@ -82,8 +91,8 @@ COMMONDEPEND="
spell? ( >=app-text/enchant-2.0.0:2= )
startup-notification? ( x11-libs/startup-notification )
svg? ( >=gnome-base/librsvg-2.40.5 )
valgrind? ( dev-util/valgrind )
webkit? ( net-libs/webkit-gtk:4 )
valgrind? ( dev-debug/valgrind )
webkit? ( net-libs/webkit-gtk:4.1 )
"
DEPEND="${COMMONDEPEND}
@ -100,33 +109,22 @@ RDEPEND="${COMMONDEPEND}
clamav? ( app-antivirus/clamav )
networkmanager? ( net-misc/networkmanager )
pdf? ( app-text/ghostscript-gpl )
perl? ( dev-lang/perl:= )
rss? (
dev-libs/libxml2
net-misc/curl
)
"
PATCHES=(
"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
"${FILESDIR}/${PN}-4.1.1-fix_lto.patch"
"${FILESDIR}/${PN}-4.1.1-Fix-bug-4224-by-using-ring-buffer.patch"
# "${FILESDIR}/debug.patch"
)
# "${FILESDIR}/debug.patch
src_prepare() {
default
eautoreconf
}
)
src_configure() {
# Don't use libsoup-gnome (bug #565924)
export HAVE_LIBSOUP_GNOME=no
local myeconfargs=(
--disable-bsfilter-plugin
--disable-dillo-plugin
--disable-generic-umpc
--disable-jpilot #735118
--disable-python-plugin
--enable-acpi_notifier-plugin
--enable-address_keeper-plugin
--enable-alternate-addressbook
@ -144,9 +142,10 @@ src_configure() {
$(use_enable clamav clamd-plugin)
$(use_enable dbus)
$(use_enable debug crash-dialog)
$(use_enable dillo dillo-plugin)
$(use_enable debug more-addressbook-debug)
$(use_enable debug more-ldap-debug)
$(use_enable debug more-archive-debug)
$(use_enable doc manual)
$(use_enable gdata gdata-plugin)
$(use_enable gnutls)
$(use_enable ldap)
$(use_enable litehtml litehtml_viewer-plugin)
@ -159,6 +158,7 @@ src_configure() {
$(use_enable pgp pgpcore-plugin)
$(use_enable pgp pgpinline-plugin)
$(use_enable pgp pgpmime-plugin)
$(use_enable python python-plugin)
$(use_enable rss rssyl-plugin)
$(use_enable session libsm)
$(use_enable sieve managesieve-plugin)
@ -184,7 +184,7 @@ src_configure() {
}
src_install() {
local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* )
default
# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps

@ -0,0 +1,10 @@
diff -Naur claws-mail-4.1.1.orig/src/common/utils.h claws-mail-4.1.1/src/common/utils.h
--- claws-mail-4.1.1.orig/src/common/utils.h 2022-05-06 12:11:04.000000000 +0200
+++ claws-mail-4.1.1/src/common/utils.h 2022-11-18 15:52:41.647794172 +0100
@@ -24,6 +24,7 @@
#define __UTILS_H__
#ifdef HAVE_CONFIG_H
+# include "config.h"
#include "claws-features.h"
#endif

@ -8,7 +8,6 @@
<use>
<flag name="archive">Enable archiving plugin</flag>
<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
<flag name="dillo">Enable dillo html viewer plugin</flag>
<flag name="gdata">Enable plugin for access to Google data providers</flag>
<flag name="libcanberra">Enable sound notification in connection with USE=notification</flag>
<flag name="libnotify">Enable notification on the desktop in connection with USE=notification</flag>
@ -16,10 +15,10 @@
<flag name="notification">Notification for new mail in different way, see also USE flags libcanberra, libindicate and libnotify</flag>
<flag name="oauth">Enable OAuth2 authentication support</flag>
<flag name="pgp">Enable PGP support</flag>
<flag name="python">Enable plugin for Python scripting</flag>
<flag name="sieve">Build plugin for sieve filter support</flag>
<flag name="smime">Build plugin for S/MIME support</flag>
<flag name="spam-report">Enable plugin for spam reporting to various services</flag>
<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg> plugin</flag>
<flag name="valgrind">Add support for memory debugging using valgrind</flag>
</use>
</pkgmetadata>

@ -1 +1,2 @@
DIST qxgedit-0.9.9.tar.gz 233109 BLAKE2B b209014afd532a57305088411cff818a02f0e7b4b555246715db413b38f3d69a0df2377d93fe2e9065b4030dd27900cdf03dbf37e311408f4b6aebc504dd0b72 SHA512 b0ad060a4eb7dbefd594b451107945f572ee8612f934c5cabdfabec90030bdb62cc1dfd1b10c414c6f7e8997e2d7ae87303ccaa7e22dc9bde4449ad73038440b
DIST qxgedit-0.9.90.tar.gz 234933 BLAKE2B 0a1de1909d83bf2dcf9b252bbef815a668c3c1030755563e28b315ce308992a76cb0d301fc692f381d10f69489bf052d9ad43f0b8a50739a1ad3e9ff30a8dafd SHA512 ad76ca04fe0c7dad2c8dacf6e53531dbf39a2cbf3993e2c3595a553ac5448afdda3a67cae47d8996fe83ded10123fadf81c21d8e36bbbf154f8e036f957d7d37
DIST qxgedit-1.0.0.tar.gz 234897 BLAKE2B 10622f0b028ff36cefbae5759e9751cc4af44cc54de86dbeb9750b4dc3dcf3432c58f0bd90a99f201b922650527fbb0c1649948470215361a5b1b9e6d446efba SHA512 3ff98b7d40f2d0548736ccf9fa7adbc6633ab2c30dd466c128ca21d0cbeb0eed6956a3985f651dd2edbeb5d681488df0eb8c1bedac98b7ec4ff281e16e3a3e13

@ -11,12 +11,13 @@ MY_PV="${PV//./_}"
HOMEPAGE="https://qxgedit.sourceforge.io/"
SRC_URI="https://github.com/rncbc/qxgedit/archive/refs/tags/${PN}_${MY_PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${PN}_${MY_PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+wayland"
S="${WORKDIR}/${PN}-${PN}_${MY_PV}"
DEPEND="
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@ -28,6 +29,7 @@ RDEPEND="${DEPEND}"
src_configure() {
CMAKE_BUILD_TYPE="RelWithDebInfo"
use wayland && local mycmakeargs+=( -DCONFIG_WAYLAND=ON )
local mycmakeargs=( -DCONFIG_QT6=OFF )
use wayland && mycmakeargs+=( -DCONFIG_WAYLAND=ON )
cmake_src_configure
}

@ -0,0 +1,32 @@
# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DESCRIPTION="QXGEdit is a software for editing MIDI files for XG devices (eg. Yamaha DB50XG)."
inherit cmake
HOMEPAGE="https://qxgedit.sourceforge.io/"
SRC_URI="https://github.com/rncbc/qxgedit/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+wayland"
DEPEND="
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
media-libs/alsa-lib:0=
"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_BUILD_TYPE="RelWithDebInfo"
local mycmakeargs=( -DCONFIG_QT6=OFF )
use wayland && mycmakeargs+=( -DCONFIG_WAYLAND=ON )
cmake_src_configure
}

@ -9,10 +9,11 @@ DESCRIPTION="GNU ccRTP - Implementation of the IETF real-time transport protocol
HOMEPAGE="https://www.gnu.org/software/ccrtp/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 x86"
LICENSE="GPL-2"
IUSE="doc"
SLOT="0/2"
KEYWORDS="amd64 x86"
IUSE="doc"
RDEPEND="
dev-libs/libgcrypt:0=
@ -20,6 +21,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen )
doc? ( app-text/doxygen )
"
PATCHES=( "${FILESDIR}"/"${PN}-${PV}"-gcrypt-only.patch )

@ -9,10 +9,13 @@ DESCRIPTION="GNU ZRTP C++ library provide ZRTP support to the GNU ccRTP stack"
HOMEPAGE="https://www.gnu.org/software/ccrtp/zrtp.html"
SRC_URI="https://github.com/wernerd/${PN^^}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 x86"
S="${WORKDIR}/${P^^}"
LICENSE="GPL-2"
IUSE="doc"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE="doc"
RDEPEND="
dev-libs/libgcrypt:0=
@ -25,5 +28,3 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}/${P}-bool-fix.patch"
"${FILESDIR}/${P}-no-git-commit.patch" )
S="${WORKDIR}/${P^^}"

@ -0,0 +1 @@
DIST cndrvcups-capt-20231107.tar.gz 46668 BLAKE2B a19773af75ec01588a3170f9bb5622cc7fcd29ffda79c79bc0119755df793a59876f0bdd89a4c3a2352316a2002362e563fbe01c2822a04379217eb1af5a36c5 SHA512 df24547bd04f955b12f489da130161aa0f1e90210d6d6d8ce1fd94713e6f5d291abe48a330fa01bd0afcd2fcca10a01f939c3e519850d4022ec26a6be99475c0

@ -0,0 +1,41 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools # multilib
COMMIT="175f8ff4464591feb67728c7752ac752c7b48d43"
DESCRIPTION="Canon CAPT-based printers (LBP-20xx/30xx)"
HOMEPAGE="https://github.com/agalakhov/captdriver/"
SRC_URI="https://github.com/agalakhov/captdriver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/captdriver-${COMMIT}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND="
>=net-print/cups-1.1.17
"
DEPEND="${RDEPEND}"
src_prepare() {
default
eautoreconf
}
src_install() {
einstalldocs
insinto /usr/share/cups/model
doins *.ppd
insinto /usr/share/cups/drv
doins src/canon-lbp.drv
exeinto $(cups-config --serverbin)/filter
doexe src/rastertocapt
}

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>support@calculate.ru</email>
<name>Mir Calculate</name>
<description>Calculate Overlay</description>
</maintainer>
<upstream><remote-id type="github">agalakhov/captdriver</remote-id></upstream>
</pkgmetadata>

@ -0,0 +1,140 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59a8b08..cc7388c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,10 @@ if (WITH_G729)
if (G729_FOUND)
message(STATUS "bcg729 OK")
set(HAVE_BCG729 TRUE)
+
+ if (G729_ANNEX_B)
+ set(HAVE_BCG729_ANNEX_B TRUE)
+ endif (G729_ANNEX_B)
include_directories(${G729_INCLUDE_DIR})
else (G729_FOUND)
diff --git a/cmake/FindG729.cmake b/cmake/FindG729.cmake
index 4a30ba0..1fbfeeb 100644
--- a/cmake/FindG729.cmake
+++ b/cmake/FindG729.cmake
@@ -1,14 +1,50 @@
+INCLUDE(CMakePushCheckState)
+INCLUDE(CheckCSourceCompiles)
+
FIND_PATH(G729_INCLUDE_DIR bcg729/decoder.h)
FIND_LIBRARY(G729_LIBRARY NAMES bcg729)
IF(G729_INCLUDE_DIR AND G729_LIBRARY)
SET(G729_FOUND TRUE)
+
+ # The bcg729 API was changed in 1.0.2 to add support for G.729 Annex B.
+ # This checks whether we are dealing with the old or new API.
+ CMAKE_PUSH_CHECK_STATE()
+ SET(CMAKE_REQUIRED_INCLUDES "${INCLUDE_DIRECTORIES}" "${G729_INCLUDE_DIR}")
+ SET(CMAKE_REQUIRED_LIBRARIES "${G729_LIBRARY}")
+ SET(CMAKE_REQUIRED_QUIET TRUE)
+ # Try to compile something using the old (pre-1.0.2) API.
+ #
+ # We cannot do it the other way around, as initBcg729EncoderChannel()
+ # did not have a prototype before 1.0.2, thus compilation would not fail
+ # when passing it an extra argument.
+ CHECK_C_SOURCE_COMPILES("
+ #include <bcg729/encoder.h>
+
+ int main() {
+ /* This function requires an argument since 1.0.2 */
+ initBcg729EncoderChannel();
+ return 0;
+ }
+ " G729_OLD_API)
+ CMAKE_POP_CHECK_STATE()
+
+ IF (G729_OLD_API)
+ SET(G729_ANNEX_B FALSE)
+ ELSE (G729_OLD_API)
+ SET(G729_ANNEX_B TRUE)
+ ENDIF (G729_OLD_API)
ENDIF(G729_INCLUDE_DIR AND G729_LIBRARY)
IF(G729_FOUND)
IF (NOT G729_FIND_QUIETLY)
MESSAGE(STATUS "Found bcg729 includes: ${G729_INCLUDE_DIR}/bcg729/decoder.h")
MESSAGE(STATUS "Found bcg729 library: ${G729_LIBRARY}")
+ IF (G729_ANNEX_B)
+ MESSAGE(STATUS "bcg729 supports Annex B; using the new (1.0.2) API")
+ ELSE (G729_ANNEX_B)
+ MESSAGE(STATUS "bcg729 does not support Annex B; using the old (pre-1.0.2) API")
+ ENDIF (G729_ANNEX_B)
ENDIF (NOT G729_FIND_QUIETLY)
ELSE(G729_FOUND)
IF (G729_FIND_REQUIRED)
diff --git a/src/audio/audio_decoder.cpp b/src/audio/audio_decoder.cpp
index 65935dd..c661910 100644
--- a/src/audio/audio_decoder.cpp
+++ b/src/audio/audio_decoder.cpp
@@ -547,7 +547,11 @@ uint16 t_g729a_audio_decoder::decode(uint8 *payload, uint16 payload_size,
for (uint16 done = 0; done < payload_size; done += 10)
{
+#ifdef HAVE_BCG729_ANNEX_B
+ bcg729Decoder(_context, &payload[done], 0, false, false, false, &pcm_buf[done * 8]);
+#else
bcg729Decoder(_context, &payload[done], false, &pcm_buf[done * 8]);
+#endif
}
return payload_size * 8;
@@ -562,7 +566,11 @@ uint16 t_g729a_audio_decoder::conceal(int16 *pcm_buf, uint16 pcm_buf_size)
{
assert(pcm_buf_size >= 80);
+#ifdef HAVE_BCG729_ANNEX_B
+ bcg729Decoder(_context, nullptr, 0, true, false, false, pcm_buf);
+#else
bcg729Decoder(_context, nullptr, true, pcm_buf);
+#endif
return 80;
}
diff --git a/src/audio/audio_encoder.cpp b/src/audio/audio_encoder.cpp
index d6ff356..952b1ee 100644
--- a/src/audio/audio_encoder.cpp
+++ b/src/audio/audio_encoder.cpp
@@ -433,7 +433,11 @@ uint16 t_g726_audio_encoder::encode(int16 *sample_buf, uint16 nsamples,
t_g729a_audio_encoder::t_g729a_audio_encoder(uint16 payload_id, uint16 ptime, t_user *user_config)
: t_audio_encoder(payload_id, ptime, user_config)
{
+#ifdef HAVE_BCG729_ANNEX_B
+ _context = initBcg729EncoderChannel(false);
+#else
_context = initBcg729EncoderChannel();
+#endif
}
t_g729a_audio_encoder::~t_g729a_audio_encoder()
@@ -451,7 +455,13 @@ uint16 t_g729a_audio_encoder::encode(int16 *sample_buf, uint16 nsamples,
for (uint16 done = 0; done < nsamples; done += 80)
{
+#ifdef HAVE_BCG729_ANNEX_B
+ uint8 frame_size = 10;
+ bcg729Encoder(_context, &sample_buf[done], &payload[done / 8], &frame_size);
+ assert(frame_size == 10);
+#else
bcg729Encoder(_context, &sample_buf[done], &payload[done / 8]);
+#endif
}
return nsamples / 8;
diff --git a/twinkle_config.h.in b/twinkle_config.h.in
index 3928565..6990142 100644
--- a/twinkle_config.h.in
+++ b/twinkle_config.h.in
@@ -3,6 +3,7 @@
#cmakedefine HAVE_ILBC
#cmakedefine HAVE_ZRTP
#cmakedefine HAVE_BCG729
+#cmakedefine HAVE_BCG729_ANNEX_B
#cmakedefine HAVE_GSM
#cmakedefine HAVE_UNISTD_H

@ -13,9 +13,7 @@
Twinkle is a SIP-based VoIP client, ported to Qt5.
</longdescription>
<use>
<flag name="diamondcard">Diamondcard.us VOIP Service</flag>
<flag name="g729">G.729 codec</flag>
<flag name="ilbc">iLBC codec</flag>
<flag name="zrtp">RTP compression</flag>
</use>
<upstream>

@ -3,7 +3,7 @@
EAPI=8
inherit cmake
inherit cmake xdg
DESCRIPTION="Softphone for VoIP communcations using SIP protocol"
HOMEPAGE="http://twinkle.dolezel.info/"
@ -12,32 +12,43 @@ SRC_URI="https://github.com/LubosD/twinkle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa diamondcard g729 ilbc speex +qt5 +zrtp"
IUSE="alsa g729 gsm speex zrtp"
DEPEND="dev-libs/boost
DEPEND="dev-libs/libxml2:2
dev-libs/ucommon
dev-libs/libxml2
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtquickcontrols2:5
dev-qt/qtwidgets:5
media-libs/fontconfig
media-libs/libsndfile
media-libs/libsndfile
net-libs/ccrtp
sys-libs/readline:=
sys-apps/file:=
alsa? ( media-libs/alsa-lib )
g729? ( media-libs/bcg729 )
ilbc? ( media-libs/libilbc )
speex? ( media-libs/speex )
gsm? ( media-sound/gsm )
speex? ( media-libs/speex media-libs/speexdsp )
zrtp? ( net-libs/zrtpcpp )"
RDEPEND="${DEPEND}"
BDEPEND=""
BDEPEND="dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex"
PATCHES=( "${FILESDIR}/${P}"-g729.patch )
src_configure() {
local mycmakeargs=(
-DWITH_ALSA=$(usex alsa)
-DWITH_DIAMONDCARD=$(usex diamondcard)
-DWITH_G729=$(usex g729)
-DWITH_ILBC=$(usex ilbc)
-DWITH_QT5=$(usex qt5)
-DWITH_GSM=$(usex gsm)
-DWITH_ILBC=no
-DWITH_QT5=yes
-DWITH_SPEEX=$(usex speex)
-DWITH_ZRTP=$(usex zrtp)
)
cmake_src_configure
}
Loading…
Cancel
Save