diff options
| author | Michael DeGuzis | 2018-06-21 13:48:22 -0400 |
|---|---|---|
| committer | Michael DeGuzis | 2018-06-21 13:48:22 -0400 |
| commit | c1dfb99e7d74b24d48fb8319cac1cc3bbfe6c7dd (patch) | |
| tree | 6baf1220d7f6ba7937207ecbeae00642e6707566 | |
| parent | c3787afd4d2eaca6c6c1aeeca87a4e216d56e794 (diff) | |
| download | aur-c1dfb99e7d74b24d48fb8319cac1cc3bbfe6c7dd.tar.gz | |
rebase with main pkg
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | libavcodec.patch | 12 |
3 files changed, 29 insertions, 9 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Thu Jun 21 17:48:08 UTC 2018 pkgbase = guacamole-server-git pkgdesc = Guacamole proxy daemon - pkgver = 0.9.13.incubating.r42.g6236eb8f + pkgver = 0.9.14.r169.gc120aa02 pkgrel = 1 url = http://guacamole.sourceforge.net/ arch = i686 @@ -33,8 +35,10 @@ pkgbase = guacamole-server-git replaces = libguac-client-rdp source = guacamole-server::git+https://github.com/apache/incubator-guacamole-server.git source = guacd.service + source = libavcodec.patch md5sums = SKIP md5sums = dfaa29349d2e73af6dac75d6cafbd762 + md5sums = 6cf58f3148d0ea3f24b4fa362ca79807 pkgname = guacamole-server-git @@ -2,7 +2,7 @@ pkgname=guacamole-server-git _gitname=guacamole-server -pkgver=0.9.13.incubating.r42.g6236eb8f +pkgver=0.9.14.r169.gc120aa02 pkgrel=1 pkgdesc="Guacamole proxy daemon" arch=('i686' 'x86_64') @@ -23,10 +23,13 @@ optdepends=('libssh: for ssh protocol support' source=( "$_gitname::git+https://github.com/apache/incubator-guacamole-server.git" 'guacd.service' + 'libavcodec.patch' ) md5sums=('SKIP' - 'dfaa29349d2e73af6dac75d6cafbd762') + 'dfaa29349d2e73af6dac75d6cafbd762' + '6cf58f3148d0ea3f24b4fa362ca79807' + ) pkgver() { cd "$srcdir"/$_gitname @@ -34,17 +37,18 @@ pkgver() { } build() { + ## Wno-error=format-overflow added to workaround build in GCC 7.1.1 cd "$srcdir"/$_gitname + patch -Np1 -i ../libavcodec.patch autoreconf -fi - PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \ - CFLAGS+=" -I/usr/include/openssl-1.0" \ - LDFLAGS+=" -L/usr/lib/openssl-1.0 -lssl" \ + #PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \ + #CFLAGS+=" -I/usr/include/openssl-1.0" \ + #LDFLAGS+=" -L/usr/lib/openssl-1.0 -lssl" \ ./configure \ - --with-openssl \ --prefix=/usr \ - --sbindir=/usr/bin \ + --sbindir=/usr/bin \ CPPFLAGS="-Wno-error=pedantic -Wno-error=format-overflow" - make + make } package() { diff --git a/libavcodec.patch b/libavcodec.patch new file mode 100644 index 000000000000..06de5db01873 --- /dev/null +++ b/libavcodec.patch @@ -0,0 +1,12 @@ +--- a/src/guacenc/guacenc.c 2018-05-25 00:11:40.315468138 +0200 ++++ b/src/guacenc/guacenc.c 2018-05-25 00:11:32.011384353 +0200 +@@ -76,7 +76,9 @@ + "version " VERSION); + + /* Prepare libavcodec */ ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) + avcodec_register_all(); ++#endif + + /* Track number of overall failures */ + int total_files = argc - optind; |