Commit c5a1670a authored by totte's avatar totte

Merge branch 'testing' into 'master'

[skip-ci]
parents 2258e794 dc2efde8
Pipeline #4633 skipped

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

.gitignore
_buildscripts
_repo
_sources
......@@ -9,10 +7,15 @@ src
dbg
hdr
*~
build-desktop.sh
build.sh
check-database.sh
check-links.sh
check-so-files.sh
clean-builddir.sh
clean-database.sh
clean-workdir.sh
copy.sh
copy-any.sh
fakeuname
get-any.sh
......@@ -23,20 +26,18 @@ pkgrels-increase.sh
pkgrels-reset.sh
rebuildlist-build.sh
rebuildlist-generate.sh
recreate-database.sh
remove.sh
repoclean-local.sh
repoclean-remote.sh
show-config.sh
show-pkglists.sh
sync-complete.sh
sync-down.sh
sync-up-nodb.sh
sync-up.sh
remove.sh
recreate-database.sh
upload.sh
upload-nodb.sh
sign-remote-db.sh
sign-remote-pkg.sh
unlock-database.sh
unlock-repo.sh
upload-nodb.sh
upload.sh
*-cfg.conf
*-makepkg.conf
......
image: chakralinux/makepkg:latest
variables:
REPODIR: "$CI_PROJECT_DIR"
stages:
- package
- sign
- deploy
- stable
before_script:
# import the gitlab-ci scripts
- git clone --depth 1 https://code.chakralinux.org/tools/chakra-gitlab-ci-scripts _gitlab-ci-scripts
# setup basic environment settings, as root
- _gitlab-ci-scripts/prepare.sh
# import pgp keys flagged as valid
- sudo -u builder -E -H _gitlab-ci-scripts/import-validpgpkeys.sh
build_pkgs:
stage: package
script:
# setup makepkg settings (enable and sync the correct repository), as root
- _gitlab-ci-scripts/prepare_makepkg.sh
# the build script can't be run as root, as makepkg would complain...
- sudo -u builder -E -H _gitlab-ci-scripts/build.sh
artifacts:
# expire artifacts per default - the gitlab web frontend can be used to keep
# artifacts of interest for an unlimited time
expire_in: 1 week
paths:
- ./_repo/gitlab-ci/*.pkg.tar.xz
- ./_logs/*.log
name: "$CI_BUILD_NAME"
cache:
paths:
- /var/cache/pacman/pkg
- ./_sources
tags:
- PKGBUILD
sign_pkgs:
stage: sign
script:
- for pkg in $(find . -type f | grep ".pkg.tar.xz"); do echo "signing $pkg" && echo "$GPG_PASSWORD" | gpg -sb --pinentry-mode loopback --passphrase-fd 0 $pkg; done
artifacts:
# expire artifacts per default - the gitlab web frontend can be used to keep
# artifacts of interest for an unlimited time
expire_in: 1 week
paths:
- ./_repo/gitlab-ci/*.pkg.tar.xz.sig
name: "$CI_BUILD_NAME"
tags:
- signature
deploy_pkgs:
stage: deploy
variables:
DEPLOY_SERVER: "$DEPLOY_SERVER"
SSH_USER: "$SSH_USER"
SSH_PORT: "$SSH_PORT"
GPG_PASSWORD: "$GPG_PASSWORD"
script:
- _gitlab-ci-scripts/deploy.sh
when: manual
tags:
- rsync
move_pkgs_to_stable:
stage: stable
variables:
DEPLOY_SERVER: "$DEPLOY_SERVER"
SSH_USER: "$SSH_USER"
SSH_PORT: "$SSH_PORT"
GPG_PASSWORD: "$GPG_PASSWORD"
DEST_REPO: "core"
script:
- _gitlab-ci-scripts/move.sh
when: manual
tags:
- rsync
### Summary
(Summarize the bug encountered concisely)
### Steps to reproduce
(How one can reproduce the issue - this is very important)
### What is the current *bug* behavior?
(What actually happens)
### What is the expected *correct* behavior?
(What you should see instead)
### Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output,
logs, and code as it's very hard to read otherwise.)
### Possible fixes
(If you can, link to the line of code that might be responsible for the problem)
/label ~"Bug"
### Link to CCR entry
(Link to the CCR entry)
### Reason for import
(Explain why it should be imported)
/label ~"Import from CCR"
### In which repository is the package now?
(Link here)
### In which repository is the package expected to be?
(Link here)
/label ~"Misplaced package"
### Which package is missing a dependency?
(Link here)
### What dependency is it missing?
(Link here, provide log files, errors, or screenshots if available)
### Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output,
logs, and code as it's very hard to read otherwise.)
/label ~"Missing dependency"
### Current version in our repositories
(Link here)
### New version available upstream
(Link to upstream release announcement for new version)
/label ~"Outdated package"
### Which package should be removed, and why?
(Explain here)
/label ~"Package removal"
pkgname=a52dec
pkgver=0.7.4
pkgrel=6
pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
url="http://liba52.sourceforge.net/"
arch=('x86_64')
license=('GPL2')
depends=('glibc')
source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
a52dec-0.7.4-build.patch)
md5sums=('caa9f5bc44232dc8aeea773fea56be80'
'fa16f224a7dceb7613824380abef0052')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
./bootstrap
./configure --prefix=/usr --enable-shared
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m644 liba52/a52_internal.h "${pkgdir}/usr/include/a52dec/"
}
diff -Naur a52dec-0.7.4.orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
--- a52dec-0.7.4.orig/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800
+++ a52dec-0.7.4/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800
@@ -1,4 +1,3 @@
-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
lib_LTLIBRARIES = liba52.la
diff -Naur a52dec-0.7.4.orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
--- a52dec-0.7.4.orig/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800
+++ a52dec-0.7.4/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800
@@ -2,7 +2,6 @@
AC_SUBST([LIBA52_LIBS])
dnl avoid -fPIC when possible
-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
AC_ARG_ENABLE([double],
[ --enable-double use double-precision samples])
diff -Naur a52dec-0.7.4.orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
--- a52dec-0.7.4.orig/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700
+++ a52dec-0.7.4/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800
@@ -1,4 +1,3 @@
-CFLAGS = @A52DEC_CFLAGS@
bin_PROGRAMS = a52dec extract_a52
a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
pkgname=aalib
pkgver=1.4rc5
pkgrel=8
pkgdesc="AAlib is a portable ASCII art GFX library"
arch=('x86_64')
url="http://aa-project.sourceforge.net/aalib/"
license=('LGPL')
depends=('glibc' 'ncurses' 'gpm' 'libx11')
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/aa-project/$pkgname-$pkgver.tar.gz
aclocal-fixes.patch)
md5sums=('9801095c42bba12edebd1902bcf0a990' '863a96a6689aa7ee073ca448bc2f133d')