From 095fd4f44ad9990622dca6167f60df06e46e0008 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Tue, 8 Sep 2020 10:03:42 -0400 Subject: [PATCH] Add/update some packages --- src/cnrdrvcups-lb/PKGBUILD | 192 ++++++++++++++++++++++++++++++++ src/makemkv/PKGBUILD | 8 +- src/ps3netsrv/PKGBUILD | 41 +++++++ src/ps3netsrv/ps3netsrv.conf | 8 ++ src/ps3netsrv/ps3netsrv.service | 13 +++ 5 files changed, 258 insertions(+), 4 deletions(-) create mode 100644 src/cnrdrvcups-lb/PKGBUILD create mode 100644 src/ps3netsrv/PKGBUILD create mode 100644 src/ps3netsrv/ps3netsrv.conf create mode 100644 src/ps3netsrv/ps3netsrv.service diff --git a/src/cnrdrvcups-lb/PKGBUILD b/src/cnrdrvcups-lb/PKGBUILD new file mode 100644 index 0000000..9907dad --- /dev/null +++ b/src/cnrdrvcups-lb/PKGBUILD @@ -0,0 +1,192 @@ +# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com +# Maintainer: Lone_Wolf +# Contributor: Steven She +# Contributor: vbPadre + +pkgname='cnrdrvcups-lb' + +# The download link changes with every version, try to keep changes in one place +_pkgver='5.10'; _dl='8/0100007658/13' + +pkgver="${_pkgver}" +pkgrel='2' +pkgdesc='CUPS Canon UFR II LIPSLX CARPS2 printer driver for LBP iR MF ImageCLASS ImageRUNNER Laser Shot i-SENSYS ImagePRESS ADVANCE printers and copiers' +arch=('x86_64') +# Direct links to the download reference go bad on the next version. We want something that will persist for a while. +url='https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx' +license=('GPL2' 'MIT' 'custom') +# parts of the code are GPL or MIT licensed, some parts have a custom license +makedepends=('jbigkit' 'gzip' 'gtk2') +depends=('gcc-libs' 'libxml2' 'libglade') +optdepends=('libjpeg6-turbo: improves printing results for color imageRUNNER/i-SENSYS LBP devices' + 'gtk2: for cnsetuputil2') + + +conflicts=('cndrvcups-lb' 'cndrvcups-common-lb') +options=('!emptydirs' '!strip' '!libtool') + +source=( "http://gdlp01.c-wss.com/gds/${_dl}/linux-UFRII-drv-v${_pkgver//\./}-uken-08.tar.gz") +md5sums=('c80793681b666766cedf864a3fd20dd7') +sha512sums=('dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54') + + +# Canon provides the sourcecode in a tarball within the dowload and we need to extract the code manually +# In order to keep the $srcdir structure tidy we put the extracted files in "extracted-${pkgname}-${_pkgver}" aka _srcdir +# the code itself is spread over many folders. +# "cnrdrvcups-common-${_pkgver}" aka _common_dir & "cnrdrvcups-lb-${_pkgver}" aka _driver_dir +# are used to keep this manageable + + +_srcdir="extracted-${pkgname}-${_pkgver}" +_common_dir="cnrdrvcups-common-${_pkgver}" +_driver_dir="cnrdrvcups-lb-${_pkgver}" + + + + +prepare() { + + mkdir "${_srcdir}" + cd "${_srcdir}" + bsdtar -xf "${srcdir}/linux-UFRII-drv-v${_pkgver//\./}-uken/Sources/${pkgname}-${pkgver}-1.tar.gz" + + local _specs=(cnrdrvcups-lb.spec) + + # cngplp/autogen.sh fails to find several libraries. + # adding these in the right place of the soon to be generated make script is hard, + # so we patch it directly into that autogen.sh + sed -e '2a export LIBS="-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"' -i "cnrdrvcups-common-${_pkgver}/cngplp/autogen.sh" + + # the autogen.sh files from canon target an old automake/autoconf version + # autoreconf converts them to a form compatible with archlinux autoconf/automake + + pushd "${_common_dir}" + for i in "backend" "buftool" "cngplp" "cnjbig" "rasterfilter" + do + pushd "$i" + autoreconf -i + popd + done + popd + pushd "${_driver_dir}" + for i in "cngplp/files" "cngplp" "cpca" "pdftocpca" + do + pushd "$i" + autoreconf -i + popd + done + popd + + # allgen.sh where available is not useful for packaging on archlinux + # Canon provides methods to build deb & rpm packages. + # The debian rules are not suited for archlinux. When the .spec-file is converted to shell the resulting arch package works. + # Chris Severach figured out a way to automate this conversion. + + # Generate make from spec %setup, %build + sed -n -e '/^%setup/,/^%install/ p' "${_specs[@]}" | \ + grep -v '^%' | \ + sed -e '# Convert spec %{VAR} to shell ${VAR}' \ + -e 's:%{:${:g' \ + -e '# Quote to allow _cflags to have spaces' \ + -e 's:${_cflags}:"${_cflags}":g' \ + -e '# Some autogen.sh commands in the spec file do not set --prefix. More than one --prefix dont cause problems so we can add it to all of them.' \ + -e 's:^./autogen.sh:& --prefix=${_prefix}:g ' \ + > 'make.Arch' + + # Generate make install from spec %install + sed -n -e '/^%install/,/^%clean/ p' "${_specs[@]}" | \ + grep -v '^%' | \ + sed -e '# Convert spec %{VAR} to shell ${VAR}' \ + -e 's:%{:${:g' \ + -e '# Quote to handle path with spaces' \ + -e 's:${RPM_BUILD_ROOT}:"&":g' \ + -e '# ln -f hides problems so should be avoided' \ + -e 's:ln -sf :ln -s :g' \ + > 'make.install.Arch' + + +} + +_setvars() { + # variables used by the (generated) make.Arch & make.install.Arch files + # relative paths start at ${srcdir}/${_srcdir} + + _vars=( + _builddir="${srcdir}/${_srcdir}" + common_dir="${_common_dir}" + driver_dir="${_driver_dir}" + utility_dir="cnrdrvcups-utility-${_pkgver}" + RPM_BUILD_DIR="${srcdir}/${_srcdir}" + _prefix='/usr' + _machine_type="MACHINETYPE="$CARCH + _cflags="CFLAGS=-march=x86-64 -fcommon -O2 -pipe -fno-plt" + _libdir='/usr/lib' + _bindir='/usr/bin' + locallibs='/usr/lib/' + _includedir='/usr/include' + b_lib_dir="${srcdir}/${_srcdir}/lib" + b_include_dir="${srcdir}/${_srcdir}/include" + _libsarch='libs64' + ) +# -fcommon is needed to compile with gcc10 , see https://gcc.gnu.org/gcc-10/porting_to.html +# -O2 -pipe -fno-plt are taken from makepkg.conf default for archlinux +# _libsarch is architecture dependent +} + +build() { + + cd "${_srcdir}" + local _vars; _setvars + # Bash does not recognize var assigments hidden by array expansion so we use env. + env "${_vars[@]}" \ + sh 'make.Arch' + +} + +package() { + cd "${_srcdir}" + + local _vars; _setvars + env "${_vars[@]}" \ + RPM_BUILD_ROOT="${pkgdir}" \ + sh 'make.install.Arch' + + # licensing information is spread over multiple files and folders + pushd "${_common_dir}" + install -Dpm644 "README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/README" + + install -Dpm644 "backend/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/backend/LICENSE.txt" + install -Dpm644 "backend/LICENSE.canon.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/backend/LICENSE.canon.txt" + install -Dpm644 "backend/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/backend/README" + + install -Dpm644 "buftool/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/buftool/LICENSE.txt" + install -Dpm644 "buftool/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/buftool/README" + + install -Dpm644 "cngplp/LICENSE.canon.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/cngplpl/LICENSE.canon.txt" + install -Dpm644 "cngplp/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/cngplpl/README" + + install -Dpm644 "cnjbig/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/cnjbig/README" + + install -Dpm644 "rasterfilter/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_common_dir}/rasterfilter/README" + + popd + pushd "${_driver_dir}" + install -Dpm644 "README" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/README" + + install -Dpm644 "cngplp/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/cngplp/README" + install -Dpm644 "cngplp/files/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/cngplp/files/README" + + install -Dpm644 "cpca/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/cpca/README" + install -Dpm644 "cpca/cnpklib/LICENSE.canon.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/cpca/cnpklib/LICENSE.canon.txt" + + install -Dpm644 "pdftocpca/README" "${pkgdir}/usr/share/licenses/${pkgname}/${_driver_dir}/pdftocpca/README" + popd + + # documentation + pushd "$srcdir/linux-UFRII-drv-v${_pkgver//\./}-uken/Documents" + install -Dpm644 "README-ufr2-5.1xUK.html" "${pkgdir}/usr/share/doc/${pkgname}/README-ufr2-5.1xUK.html" + install -Dpm644 "UsersGuide-ufr2-UK.html" "${pkgdir}/usr/share/doc/${pkgname}/UsersGuide-ufr2-UK.html" + install -Dpm644 "LICENSE-EN.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Documents/LICENSE-EN.txt" + popd + +} diff --git a/src/makemkv/PKGBUILD b/src/makemkv/PKGBUILD index 0b60a0b..3294571 100644 --- a/src/makemkv/PKGBUILD +++ b/src/makemkv/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Olaf Bauer pkgname=makemkv -pkgver=1.15.1 +pkgver=1.15.2 pkgrel=1 pkgdesc="DVD and Blu-ray to MKV converter and network streamer" arch=('i686' 'x86_64') @@ -18,15 +18,15 @@ source=(${url}/download/${pkgname}-bin-${pkgver}.tar.gz makemkv.1 makemkvcon.1 mmdtsdec.1) -md5sums=('9ba6435fa47c31edc227323e6d6dc577' - '45a3d19bb0ba932f389d209984ba6ae2' +md5sums=('17dd19b4d92354f9489188c4edd2a285' + '96e7282e421127c85405deacff7a2e13' '1f9b3a91427a2015434e501542443f4c' '7f4b112c5178860cc2eb25059ae1af2a' '9476154228bf1b1f983178ba8565ac44') build() { cd "${srcdir}/${pkgname}-oss-${pkgver}" - CC=gcc CXX=g++ ./configure --prefix=/usr + CFLAGS="$CFLAGS -std=c++11" CC=gcc CXX=g++ ./configure --prefix=/usr make } diff --git a/src/ps3netsrv/PKGBUILD b/src/ps3netsrv/PKGBUILD new file mode 100644 index 0000000..b3e2918 --- /dev/null +++ b/src/ps3netsrv/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: nl6720 + +pkgname=ps3netsrv +_wMM_version=1.47.28 +pkgver=20200708 +pkgrel=1 +pkgdesc='PS3 Net Server (mod by aldostools)' +arch=('x86_64') +url='https://github.com/aldostools/webMAN-MOD/' +license=('MIT') +depends=('gcc-libs' 'mbedtls') +makedepends=('meson') +backup=("etc/conf.d/${pkgname}") +source=( + "https://github.com/aldostools/webMAN-MOD/releases/download/${_wMM_version}/ps3netsrv_${pkgver}.zip" + "${pkgname}.service" + "${pkgname}.conf" +) +sha512sums=( + '338babce04958fe17857b0e772f397bf87c39c6a801d5670ca20ac054fbf2d7032bbf4eeb0521858d8843ddf27e00c009b9802694b315cec713b939aeb430312' + 'ce955bbaf577963244a6e96a8a8fffe037e5067321bc507fe7f71b12d8e198b5280de708dd9cffbf59d0c9a82e05bf9901dbcc8f8bc0d548b2d2c2ead7e07941' + 'c81e3ef6a4bf07cd150b205793ca5a3886cf9d76c1087cc1d1325ca779628c074cfcbe8349b0bda691f61ab4f394d8594af1ed945c7207acc5712057dc5fbe59' +) + +build() { + cd "${srcdir}/${pkgname}_${pkgver}/${pkgname}" + meson --prefix /usr --buildtype=plain build + ninja -C build +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}/${pkgname}" + DESTDIR="$pkgdir" ninja -C build install + install -Dm644 "${srcdir}/${pkgname}.service" "$pkgdir/usr/lib/systemd/system/${pkgname}.service" + install -Dm644 "${srcdir}/${pkgname}.conf" "$pkgdir/etc/conf.d/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}_${pkgver}/LICENSE.TXT" "$pkgdir/usr/share/licenses/${pkgname}/LICENSE.TXT" + +echo 'u ps3netsrv - "PS3 Net Server daemon"' | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + +} diff --git a/src/ps3netsrv/ps3netsrv.conf b/src/ps3netsrv/ps3netsrv.conf new file mode 100644 index 0000000..aaebe2b --- /dev/null +++ b/src/ps3netsrv/ps3netsrv.conf @@ -0,0 +1,8 @@ +ROOTDIRECTORY="" + +# Default port: 38008 +PORT="" + +# Whitelist: x.x.x.x, where x is 0-255 or * +# (e.g 192.168.1.* to allow only connections from 192.168.1.0-192.168.1.255) +WHITELIST="" diff --git a/src/ps3netsrv/ps3netsrv.service b/src/ps3netsrv/ps3netsrv.service new file mode 100644 index 0000000..77ffbff --- /dev/null +++ b/src/ps3netsrv/ps3netsrv.service @@ -0,0 +1,13 @@ +[Unit] +Description=ps3netsrv (mod by aldostools) +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/ps3netsrv +User=ps3netsrv +Group=ps3netsrv +ExecStart=/usr/bin/ps3netsrv $ROOTDIRECTORY $PORT $WHITELIST +ExecStop=/usr/bin/kill -TERM $MAINPID + +[Install] +WantedBy=multi-user.target