Reorganize repo
This commit is contained in:
parent
aa96c34dee
commit
ee0ec416be
|
@ -1,4 +1,3 @@
|
|||
repo/
|
||||
src/
|
||||
pkg/
|
||||
.rootbld-repositories
|
||||
|
|
|
@ -1,370 +0,0 @@
|
|||
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=chromium
|
||||
pkgver=86.0.4240.111
|
||||
pkgrel=0
|
||||
pkgdesc="Chromium web browser"
|
||||
url="https://www.chromium.org/Home"
|
||||
arch="x86_64 aarch64" # x86: ./v8_context_snapshot_generator segfaults
|
||||
# armv7: /usr/bin/ld: final link failed: memory exhausted when linking chrome
|
||||
license="BSD-3-Clause"
|
||||
depends="xdg-utils"
|
||||
makedepends="
|
||||
alsa-lib-dev
|
||||
pulseaudio-dev
|
||||
bash
|
||||
binutils-gold
|
||||
bison flex
|
||||
bsd-compat-headers
|
||||
bzip2-dev
|
||||
cairo-dev
|
||||
clang-dev
|
||||
cups-dev
|
||||
dbus-glib-dev
|
||||
elfutils-dev
|
||||
eudev-dev
|
||||
ffmpeg-dev
|
||||
findutils
|
||||
flac-dev
|
||||
freetype-dev
|
||||
gnutls-dev
|
||||
gperf
|
||||
gtk+3.0-dev
|
||||
gzip
|
||||
harfbuzz-dev
|
||||
hunspell-dev
|
||||
hwids-usb
|
||||
jpeg-dev
|
||||
jsoncpp-dev
|
||||
krb5-dev
|
||||
libbsd-dev
|
||||
libcap-dev
|
||||
libevent-dev
|
||||
libexif-dev
|
||||
libgcrypt-dev
|
||||
libgnome-keyring-dev
|
||||
libjpeg-turbo-dev
|
||||
libpng-dev
|
||||
libusb-dev
|
||||
libva-dev
|
||||
libwebp-dev
|
||||
libxcomposite-dev
|
||||
libxcursor-dev
|
||||
libxinerama-dev
|
||||
libxml2-dev
|
||||
libxrandr-dev
|
||||
libxscrnsaver-dev
|
||||
libxslt-dev
|
||||
linux-headers
|
||||
mesa-dev
|
||||
minizip-dev
|
||||
ninja
|
||||
nodejs
|
||||
nss-dev
|
||||
openjdk8
|
||||
opus-dev
|
||||
pciutils-dev
|
||||
perl
|
||||
python2
|
||||
re2-dev
|
||||
snappy-dev
|
||||
speex-dev
|
||||
sqlite-dev
|
||||
xcb-proto
|
||||
xdg-utils
|
||||
zlib-dev
|
||||
py2-setuptools
|
||||
"
|
||||
# explicit depends for --headless
|
||||
depends="eudev-libs ttf-opensans"
|
||||
options="suid"
|
||||
subpackages="$pkgname-chromedriver"
|
||||
source="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
|
||||
pstables-2.8.h::https://git.savannah.gnu.org/cgit/freetype/freetype2.git/plain/src/psnames/pstables.h?h=VER-2-8
|
||||
chromium-launcher.sh
|
||||
chromium.conf
|
||||
chromium.desktop
|
||||
google-api.keys
|
||||
|
||||
default-pthread-stacksize.patch
|
||||
musl-fixes.patch
|
||||
musl-fixes-breakpad.patch
|
||||
musl-hacks.patch
|
||||
musl-libc++.patch
|
||||
musl-sandbox.patch
|
||||
no-execinfo.patch
|
||||
no-mallinfo.patch
|
||||
resolver.patch
|
||||
swiftshader.patch
|
||||
create-extra-view-redefinition.patch
|
||||
|
||||
chromium-use-alpine-target.patch
|
||||
media-base.patch
|
||||
musl-crashpad.patch
|
||||
musl-v8-monotonic-pthread-cont_timedwait.patch
|
||||
nasm.patch
|
||||
|
||||
gcc-fno-delete-null-pointer-checks.patch
|
||||
gcc-arm.patch
|
||||
aarch64-fixes.patch
|
||||
elf-arm.patch
|
||||
|
||||
chromium-size_t-defined.patch
|
||||
check-for-enable-accelerated-video-decode-on-Linux.patch
|
||||
fix-invalid-end-iterator-usage-in-CookieMonster.patch
|
||||
only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
|
||||
remove-dead-reloc-in-nonalloc-LD-flags.patch
|
||||
xproto-fix-underflow-in-Fp1616ToDouble.patch
|
||||
"
|
||||
|
||||
# secfixes:
|
||||
# 83.0.4103.116-r0:
|
||||
# - CVE-2020-6505
|
||||
# - CVE-2020-6506
|
||||
# - CVE-2020-6507
|
||||
# - CVE-2020-6509
|
||||
# 72.0.3626.121-r0:
|
||||
# - CVE-2019-5786
|
||||
|
||||
if [ -n "$DEBUG" ]; then
|
||||
_buildtype=Debug
|
||||
_is_debug=true
|
||||
else
|
||||
_buildtype=Release
|
||||
_is_debug=false
|
||||
fi
|
||||
|
||||
prepare() {
|
||||
patch_args="-p0"
|
||||
default_prepare
|
||||
|
||||
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
|
||||
touch chrome/test/data/webui/i18n_process_css_test.html
|
||||
# Use the file at run time instead of effectively compiling it in
|
||||
sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
|
||||
-i services/device/public/cpp/usb/BUILD.gn
|
||||
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
||||
# reusable system library settings
|
||||
local use_system="
|
||||
ffmpeg
|
||||
flac
|
||||
fontconfig
|
||||
freetype
|
||||
harfbuzz-ng
|
||||
libdrm
|
||||
libevent
|
||||
libjpeg
|
||||
libpng
|
||||
libwebp
|
||||
libxml
|
||||
libxslt
|
||||
opus
|
||||
re2
|
||||
snappy
|
||||
"
|
||||
for _lib in $use_system libjpeg_turbo; do
|
||||
msg "Removing buildscripts for system provided $_lib"
|
||||
find -type f -path "*third_party/$_lib/*" \
|
||||
\! -path "*third_party/$_lib/chromium/*" \
|
||||
\! -path "*third_party/$_lib/google/*" \
|
||||
\! -path './base/third_party/icu/*' \
|
||||
\! -path './third_party/libxml/*' \
|
||||
\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
|
||||
\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
|
||||
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||
-delete
|
||||
done
|
||||
|
||||
msg "Replacing gn files"
|
||||
python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
$use_system
|
||||
third_party/libaddressinput/chromium/tools/update-strings.py
|
||||
|
||||
}
|
||||
|
||||
_gn_flags() {
|
||||
echo $*
|
||||
}
|
||||
|
||||
build() {
|
||||
##############################################################
|
||||
# Please dont use these keys outside of Alpine Linux project #
|
||||
# You can create your own at: #
|
||||
# http://www.chromium.org/developers/how-tos/api-keys #
|
||||
##############################################################
|
||||
eval "$(base64 -d < $srcdir/google-api.keys)"
|
||||
|
||||
msg "Bootstrapping GN"
|
||||
local _c=$(_gn_flags is_clang=true \
|
||||
use_sysroot=false \
|
||||
treat_warnings_as_errors=false \
|
||||
fatal_linker_warnings=false \
|
||||
use_custom_libcxx=false \
|
||||
use_gold=false \
|
||||
use_allocator=\"none\" \
|
||||
use_allocator_shim=false \
|
||||
use_vaapi=true \
|
||||
)
|
||||
|
||||
# AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \
|
||||
CC="${CC:-clang}" CXX="${CXX:-clang++}" LD="${CXX:-clang++}" \
|
||||
python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c"
|
||||
|
||||
msg "Configuring build"
|
||||
_c=$(_gn_flags \
|
||||
blink_symbol_level=0 \
|
||||
clang_use_chrome_plugins=false \
|
||||
closure_compile=true \
|
||||
custom_toolchain=\"//build/toolchain/linux/unbundle:default\" \
|
||||
enable_hangout_services_extension=true \
|
||||
enable_nacl_nonsfi=false \
|
||||
enable_nacl=false \
|
||||
enable_precompiled_headers=false \
|
||||
fatal_linker_warnings=false \
|
||||
ffmpeg_branding=\"Chrome\" \
|
||||
fieldtrial_testing_like_official_build=true \
|
||||
gold_path=\"/usr/bin/ld.gold\" \
|
||||
google_api_key=\"$_google_api_key\" \
|
||||
google_default_client_id=\"$_google_default_client_id\" \
|
||||
google_default_client_secret=\"$_google_default_client_secret\" \
|
||||
host_toolchain=\"//build/toolchain/linux/unbundle:default\" \
|
||||
icu_use_data_file=true \
|
||||
is_clang=true \
|
||||
is_component_build=false \
|
||||
is_debug=$_is_debug \
|
||||
is_desktop_linux=true \
|
||||
linux_use_bundled_binutils=false \
|
||||
proprietary_codecs=true \
|
||||
symbol_level=0 \
|
||||
treat_warnings_as_errors=false \
|
||||
use_allocator_shim=false \
|
||||
use_allocator=\"none\" \
|
||||
use_cups=true \
|
||||
use_custom_libcxx=false \
|
||||
use_gnome_keyring=false \
|
||||
use_gold=false \
|
||||
use_lld=false \
|
||||
use_pulseaudio=true \
|
||||
use_sysroot=false \
|
||||
use_system_harfbuzz=true \
|
||||
)
|
||||
|
||||
AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \
|
||||
out/Release/gn gen out/$_buildtype --args="$_c $_ca"
|
||||
|
||||
# Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2
|
||||
ln -sf /usr/lib/python3.*/site-packages/xcbgen .
|
||||
export PYTHONPATH="$PWD"
|
||||
|
||||
msg "Ninja turtles GO!"
|
||||
|
||||
# build mksnapshot
|
||||
ninja -j ${JOBS} -C out/$_buildtype mksnapshot
|
||||
ninja -j ${JOBS} -C out/$_buildtype v8_context_snapshot_generator
|
||||
|
||||
if [ "$CARCH" = "x86" ]; then
|
||||
# x86 only - dependency issues compiling obj/chrome/browser/devtools/devtools/cast_handler.o
|
||||
ninja -j ${JOBS} -C out/$_buildtype obj/chrome/common/media_router/mojom/media_router__generator.stamp
|
||||
fi
|
||||
|
||||
# final link needs lots of file descriptors
|
||||
ulimit -n 2048
|
||||
|
||||
# finish rest of the build
|
||||
ninja -j ${JOBS} -C out/$_buildtype chrome chrome_sandbox chromedriver
|
||||
}
|
||||
|
||||
package() {
|
||||
cd out/$_buildtype
|
||||
local bin pak
|
||||
for bin in chrome chromedriver *.bin; do
|
||||
install -Dm755 $bin "$pkgdir"/usr/lib/$pkgname/$bin
|
||||
done
|
||||
|
||||
install -Dm755 swiftshader/libEGL.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libEGL.so
|
||||
install -Dm755 swiftshader/libGLESv2.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libGLESv2.so
|
||||
|
||||
install -Dm4755 chrome_sandbox "$pkgdir"/usr/lib/$pkgname/chrome-sandbox
|
||||
install -m644 icudtl.dat "$pkgdir"/usr/lib/$pkgname/icudtl.dat
|
||||
|
||||
install -Dm755 xdg-mime "$pkgdir"/usr/lib/$pkgname/xdg-mime
|
||||
install -Dm755 xdg-settings "$pkgdir"/usr/lib/$pkgname/xdg-settings
|
||||
|
||||
for pak in *.pak; do
|
||||
install -Dm644 $pak "$pkgdir"/usr/lib/$pkgname/$pak
|
||||
done
|
||||
|
||||
install -Dm755 "$srcdir"/chromium-launcher.sh \
|
||||
"$pkgdir"/usr/lib/$pkgname/chromium-launcher.sh
|
||||
|
||||
cp -a locales "$pkgdir"/usr/lib/$pkgname/
|
||||
cp -a MEIPreload "$pkgdir"/usr/lib/$pkgname/
|
||||
|
||||
# It is important that we name the target "chromium-browser",
|
||||
# xdg-utils expect it; bug #355517.
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
cd "$pkgdir"/usr/bin
|
||||
ln -sf /usr/lib/$pkgname/chromium-launcher.sh chromium-browser
|
||||
ln -sf /usr/lib/$pkgname/chromedriver "$pkgdir"/usr/bin/
|
||||
|
||||
install -Dm644 "$srcdir"/chromium.conf \
|
||||
"$pkgdir"/etc/chromium/chromium.conf
|
||||
|
||||
install -Dm644 "$srcdir"/chromium.desktop \
|
||||
"$pkgdir"/usr/share/applications/chromium.desktop
|
||||
|
||||
cd "$builddir"
|
||||
for size in 24 48 64 128 256; do
|
||||
install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
|
||||
"$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png"
|
||||
done
|
||||
|
||||
for size in 16 32; do
|
||||
install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
|
||||
"$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png"
|
||||
done
|
||||
}
|
||||
|
||||
chromedriver() {
|
||||
pkgdesc="WebDriver driver for the Chromium Browser"
|
||||
mkdir -p "$subpkgdir"/usr/lib/$pkgname "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/lib/$pkgname/chromedriver \
|
||||
"$subpkgdir"/usr/lib/$pkgname/
|
||||
mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
|
||||
}
|
||||
|
||||
sha512sums="809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54 chromium-86.0.4240.111.tar.xz
|
||||
a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h
|
||||
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
|
||||
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
|
||||
e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop
|
||||
2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys
|
||||
b726ef2ecfe7d471e60d67de1e05847d214df6093b41bb2055652a9028327af19a8b10e7175467240f4dfec9e3ae97a6c4666bfd2cd6cb436c54656a085653ae default-pthread-stacksize.patch
|
||||
4620f7515717eb185339af1f52f40e5c6ccd15b9162986517eb5cf3cbaf29740134f520997e2a1337ea51fd69dc0354b297f6cc4d1555ed546ffdc1dbcb51f5c musl-fixes.patch
|
||||
e8675aff9fccd8b58cc839ef1d9e0e022d66aa94f72baa72e7acf92ceb2691f6a7907cc60ec3a87f894efdd639a3dec7fe702c97d446fcdea99452caec57e002 musl-fixes-breakpad.patch
|
||||
ddacc7ab0374eaa110a392c9d0912c250eb102f060cac284b170902fa9358f8670cbe26676582208d1291662058761e31795ebac75115b38a1e3ad8681895b38 musl-hacks.patch
|
||||
919f13a2cd65673f267321cf95c5410e65bc5264d6704d0791b25d39111282bedb425bd9824dde3b67422cfb874c86a9383ded686e39cfd4aac239edaf41cfc8 musl-libc++.patch
|
||||
ef43fa90b05e2407b6daa822193121cdeef6ee9068175572f0928f156f186be9c77539dfa06863adfaa25afd498ec1b5081f9e476543616f9472b9033fd921dc musl-sandbox.patch
|
||||
129ec746fd951ee6d0bf0b4389b7c988523870507de1f92f5706f4eb49039d4a49ed30e92b0634e3ae521fc3e129adc1c6edc7435922fc91658d8c087520c707 no-execinfo.patch
|
||||
06d6b4c466fa48f2d22c338e20458d8fa50bbbf744468f41bc3c1892e739002b1fbc5c133a37252cec4ff4f804847add6b9c0cc1f84fb276939471c09e467fb6 no-mallinfo.patch
|
||||
f60c89076bbc458e2e38d9dad26027f9604179fd59e0c2b988a86340b9ef78a4c346c84ac3e7e4e70badaff69d71edf49d7b9030e5fadb96afde4f977a98c412 resolver.patch
|
||||
f4265df7532625070c51ac43466e3e0f21e696f90c3b6040ef62a21defa7666203ff8219d9c9a5bebc011024aff300fbcbd941cebd0df59c4bc068d8f290221e swiftshader.patch
|
||||
5b88c065819a44684ceea87239320f8120cfde0dc2f6dd739a007488dea6608c11584c56f3876a062641c9ca6fa82f43877c547ad470766aec31f5151bb2bdc1 create-extra-view-redefinition.patch
|
||||
cf9970ef403ff7a68bf08c0ba5e681eec459fcb1afb6859e5a80f4874f1b9a656377b4540eeb5208ddec570efa206f147e32718c687fa29ca3acc4fde6e8cbe8 chromium-use-alpine-target.patch
|
||||
599f5ef338b5797e04436bdc88921c31365d2dea2613d40053be6e774f654e2889efb0c0bd55c2c5044a6805510fbc337da555971169a75d584fac93e18256ac media-base.patch
|
||||
2e5a83826239849d096aead033eb519338b84e6fbbf58abfcd7cfe40d0b3070b66bcc825ec84406484d73d1a333f1b9d23a8ab44987ab5c8b187076c84cd668b musl-crashpad.patch
|
||||
556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa musl-v8-monotonic-pthread-cont_timedwait.patch
|
||||
7957aae04e8ef3badbc98c982ba1acb1b9ef5e665440116c704512f11554d7b64ba3643b7ff7d00476a6686324033b0cf762deb78ce798619226380953b9dc9c nasm.patch
|
||||
56a357668c0928bc488ccec8f53fd37fccbaefe0a185ceaf067c8c39e0fae3d2b61ca010ccabc785bec0f2e86b19f37cebb3ac344225aa8d7651c822e48c6064 gcc-fno-delete-null-pointer-checks.patch
|
||||
ad4ddc25df7aa1de2038b7adb86d27679ecdb7e3e16c0eec994e947a08c41504b6fb41166f7868ff5f58ce8191c78800cbb91d259c864840fa5af1d7ba5d43a1 gcc-arm.patch
|
||||
cc67d2a77910663e5a1ad5f66606ee2544867aa1fef25e1a1bc355a8db765d5928edb72f158e6a2ece4195c9b62b875dcdcab4e4055e7611edab405e8cfd658e aarch64-fixes.patch
|
||||
9b1441fe42421ef9ead86a5143bf997d989bd53a8969cdfdf4e0c45f847efc8c1d127e15fb05e2ef5dbefbb228cbdc2849404d74997ca56265599e12e5efd6e4 elf-arm.patch
|
||||
17ed804782df7161e58cb1c125b2cdee22a63008a240da6d3409a7b7a356dc4bd5971aa61217b7aefcfa130e3e12a753bc0fe96882cde842917cf5d6df46083f chromium-size_t-defined.patch
|
||||
6bda2c9d622a77d50832b56c36239a2d79eb8dce7825e9cf99b82132d0a6e58ba23e253ec1a71cf6600111afe4c0917d26ba54ab1b6d7ceea5d57bb8e5f8e4c1 check-for-enable-accelerated-video-decode-on-Linux.patch
|
||||
a239bb09ea79875d821a53f8769ef19997c60012dc474139a21f6818a031e77fe16aed6dee9fb8b9fd9411bbaf9901f674de480012badae51ff17e9bea35fd70 fix-invalid-end-iterator-usage-in-CookieMonster.patch
|
||||
a8088aea5e27723b34bec232406a743f93cf4ebcaa7b48bda1669d8a8fbc3083eec4d3921c2ab1e002eb443f74205c7f1e73cd0bb303fa20f0f1a1f255dcbdcb only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
|
||||
862fbd405a06e570891d84634a3aff943f0eb1458308211d7ac98d84a9f57c779deba7e91e4b1efbbce15a8b14734dc86ed625165bf3ce8d31ef67d26ba7cecf remove-dead-reloc-in-nonalloc-LD-flags.patch
|
||||
b425d6ab3da04b6a8d32303d1c39feb9c1be813fac9b38eb53fd5d020ff08b4b3e247897d5b5c5dac3a7a213c5d3eaf3ea2342c97d22089f2c623e28a124f00d xproto-fix-underflow-in-Fp1616ToDouble.patch"
|
|
@ -1,136 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
pkgname=qt5-qtwebengine
|
||||
pkgver=5.15.2
|
||||
pkgrel=1
|
||||
pkgdesc="Qt5 - QtWebEngine components"
|
||||
url="https://www.qt.io/developers/"
|
||||
# ppc64le and s390x are not supported
|
||||
# mips is also not supported
|
||||
# armhf blocked by qt5-qtdeclarative
|
||||
arch="aarch64 armv7 x86 x86_64"
|
||||
license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
|
||||
depends_dev="
|
||||
ffmpeg-dev
|
||||
glib-dev
|
||||
gst-plugins-base-dev
|
||||
gstreamer-dev
|
||||
icu-dev
|
||||
libxcomposite-dev
|
||||
libxext-dev
|
||||
libxkbcommon-dev
|
||||
libxrender-dev
|
||||
libxslt-dev
|
||||
mesa-dev
|
||||
ninja
|
||||
"
|
||||
makedepends="$depends_dev
|
||||
alsa-lib-dev
|
||||
pulseaudio-dev
|
||||
bison
|
||||
bsd-compat-headers
|
||||
flex
|
||||
fontconfig-dev
|
||||
gperf
|
||||
gzip
|
||||
harfbuzz-dev
|
||||
jsoncpp-dev
|
||||
libevent-dev
|
||||
libjpeg-turbo-dev
|
||||
libpng-dev
|
||||
libsrtp-dev
|
||||
libvpx-dev
|
||||
libwebp-dev
|
||||
libxcursor-dev
|
||||
libxi-dev
|
||||
libxml2
|
||||
libxrandr-dev
|
||||
libxslt
|
||||
libxtst-dev
|
||||
linux-headers
|
||||
nss-dev
|
||||
opus-dev
|
||||
pcre-dev
|
||||
protobuf-dev
|
||||
qt5-qtbase-dev
|
||||
qt5-qtdeclarative-dev
|
||||
qt5-qtwebchannel-dev
|
||||
re2-dev
|
||||
ruby
|
||||
snappy-dev
|
||||
sqlite-dev
|
||||
yasm-dev
|
||||
zlib-dev
|
||||
python2
|
||||
"
|
||||
subpackages="$pkgname-dev $pkgname-dbg"
|
||||
|
||||
case $pkgver in
|
||||
*_beta*|*_rc*) _rel=development_releases;;
|
||||
*) _rel=official_releases;;
|
||||
esac
|
||||
|
||||
source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtwebengine-everywhere-src-$pkgver.tar.xz
|
||||
qt-musl-dispatch_to_musl.patch
|
||||
qt-musl-execinfo.patch
|
||||
qt-musl-mallinfo.patch
|
||||
qt-musl-off_t.patch
|
||||
qt-musl-pvalloc.patch
|
||||
qt-musl-resolve.patch
|
||||
qt-musl-siginfo_t.patch
|
||||
qt-musl-fpstate.patch
|
||||
qt-musl-pread-pwrite.patch
|
||||
qt-musl-sysreg-for__WORDSIZE.patch
|
||||
qt-musl-stackstart.patch
|
||||
qt-musl-thread-stacksize.patch
|
||||
qt-musl-elf-arm.patch
|
||||
qt-musl-crashpad.patch
|
||||
musl-sandbox.patch
|
||||
yasm-nls.patch
|
||||
nasm.patch
|
||||
musl-hacks.patch
|
||||
sandbox-sched_getparam.patch
|
||||
remove-glibc-check.patch
|
||||
static-pulseaudio-link.patch
|
||||
"
|
||||
builddir="$srcdir/qtwebengine-everywhere-src-$pkgver"
|
||||
|
||||
build() {
|
||||
qmake-qt5 QMAKE_EXTRA_ARGS+="-system-ffmpeg -system-opus -system-webp -pulseaudio -proprietary-codecs"
|
||||
make -j$JOBS
|
||||
}
|
||||
|
||||
package() {
|
||||
make install INSTALL_ROOT="$pkgdir"
|
||||
sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
|
||||
|
||||
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
|
||||
find "$pkgdir/usr/lib" -type f -name '*.prl' \
|
||||
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
|
||||
|
||||
install -d "$pkgdir"/usr/share/licenses
|
||||
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
|
||||
}
|
||||
|
||||
sha512sums="de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756 qtwebengine-everywhere-src-5.15.2.tar.xz
|
||||
5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch
|
||||
7084a07386fb9f66fbfeadac53869c0f386cea98dbb29787f030635bc8cd116b7459acafbe06540f1aef79d8a69817520ad18bcb9ac24954dd70773ef083537e qt-musl-execinfo.patch
|
||||
7f580b37907aeba8327c4eb1e46fd261ad78d93f1dd32991dfb373a7f75fb4dceb3d9302e3781c62f447e72c4edab0f7a7f4223d12dd98ec5e87e49f3f38a38a qt-musl-mallinfo.patch
|
||||
7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0 qt-musl-off_t.patch
|
||||
ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5 qt-musl-pvalloc.patch
|
||||
8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610 qt-musl-resolve.patch
|
||||
2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f qt-musl-siginfo_t.patch
|
||||
059f22a594a046d552a33b17d811c50b645c4be11a49ed3b29a32ce38d501fd07c1e15a4e1075c46f984c850bf88aecb357e4310a62b30494ea25297055f05c8 qt-musl-fpstate.patch
|
||||
b1f7823d0bdd14dbcb4dbd72ab2d16460d343722d2601921a50f8912ce580a632e0d7b01d7fea6f27ff5014a1f21595c6d8d4500b995bcc6db38cbd10ac4aa96 qt-musl-pread-pwrite.patch
|
||||
987b9b35d04317e22ae2cce382e776f3309fc7fd4588e408cd6bed846f47620d01e2b9958cb60c84b8f6f496de6544a21ba399ba8b8f107b73df179794740092 qt-musl-sysreg-for__WORDSIZE.patch
|
||||
7dc3e9995596adef65cd96f650eb7ee13d52cabfe6353f04eeb5b8a5776e7e0585ffc2a0a31deea6924352ee9a5a8e03ac37432b558c6a46f3dc457b4283392a qt-musl-stackstart.patch
|
||||
b37fbc4df03c82123f94982039defa12d9bb8c885c9dcf8fff556b5f9cc58182fa471f970cc3a5e2d5dbe964855f591b474366b6a8926d94ae6a78e883811c1a qt-musl-thread-stacksize.patch
|
||||
d38e73a0424a104682c8cd94de32e506abf38f0ace34935eb33d66c732af30e6b22c0faec8cf698424a4391d965338ed6646325c9b9862a0c0be2faeaa169071 qt-musl-elf-arm.patch
|
||||
173c401e1a0daa7a1471880807e4fb0a74fc338a0f306dc067147878c29e7bb94cae43c37fe2bf21dd7a7ffd2d739697fd21d10c059ce647df01d8236612cc68 qt-musl-crashpad.patch
|
||||
dec69ea8dd9cfa2973264ec405092d364513bbd47303a94c128d873a3de7294760340f3ad31753e6bddd42e98c547312e070b49a062f693b2e19aa01d772063a musl-sandbox.patch
|
||||
f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch
|
||||
9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch
|
||||
b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch
|
||||
dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch
|
||||
7153ce7372fed73dccb676079bc5af37f56be113f42ee64ed48cd7997dc2a4aa287523f36f0b8d3c717f1c4ad7f796843850b86a2dce50de5f0ade6a47785bee remove-glibc-check.patch
|
||||
12539c0dde32f532d9534a9430417b5d8521b272403a8fcbc1472f58853ef160da2ce2f1577dfa383c5461acdb961d9735345a789bec04e02966fc24d169c95e static-pulseaudio-link.patch"
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
|
||||
index dbc8c5aaf..077bbde33 100644
|
||||
--- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
|
||||
+++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc
|
||||
@@ -1191,7 +1191,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers(
|
||||
msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
|
||||
msgvec->reserve(buffers.size());
|
||||
for (size_t j = 0; j < buffers.size(); j++)
|
||||
- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
|
||||
+ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
|
||||
int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
|
||||
SendResult send_result(0, 0, std::move(buffers));
|
||||
if (result < 0) {
|
|
@ -1,162 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
index 348ab6e8c..2eac6ef82 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||
@@ -139,21 +139,11 @@ namespace sandbox {
|
||||
// present (as in newer versions of posix_spawn).
|
||||
ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||
const Arg<unsigned long> flags(0);
|
||||
-
|
||||
- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2.
|
||||
- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES |
|
||||
- CLONE_SIGHAND | CLONE_THREAD |
|
||||
- CLONE_SYSVSEM;
|
||||
- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED;
|
||||
-
|
||||
- const uint64_t kGlibcPthreadFlags =
|
||||
- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD |
|
||||
- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID;
|
||||
- const BoolExpr glibc_test = flags == kGlibcPthreadFlags;
|
||||
-
|
||||
- const BoolExpr android_test =
|
||||
- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask,
|
||||
- flags == kGlibcPthreadFlags);
|
||||
+ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
|
||||
+ CLONE_THREAD | CLONE_SYSVSEM;
|
||||
+ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID |
|
||||
+ CLONE_DETACHED;
|
||||
+ const BoolExpr thread_clone_ok = (flags&~safe)==required;
|
||||
|
||||
// The following two flags are the two important flags in any vfork-emulating
|
||||
// clone call. EPERM any clone call that contains both of them.
|
||||
@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() {
|
||||
AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0,
|
||||
(flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags);
|
||||
|
||||
- return If(IsAndroid() ? android_test : glibc_test, Allow())
|
||||
+ return If(thread_clone_ok, Allow())
|
||||
.ElseIf(is_fork_or_clone_vfork, Error(EPERM))
|
||||
.Else(CrashSIGSYSClone());
|
||||
}
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
index 6e2bd4fee..9f9e4ad8a 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||
@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||
#if defined(__i386__)
|
||||
case __NR_waitpid:
|
||||
#endif
|
||||
+ case __NR_set_tid_address:
|
||||
return true;
|
||||
case __NR_clone: // Should be parameter-restricted.
|
||||
case __NR_setns: // Privileged.
|
||||
@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||
case __NR_set_thread_area:
|
||||
#endif
|
||||
- case __NR_set_tid_address:
|
||||
case __NR_unshare:
|
||||
#if !defined(__mips__) && !defined(__aarch64__)
|
||||
case __NR_vfork:
|
||||
@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
|
||||
case __NR_mlock:
|
||||
case __NR_munlock:
|
||||
case __NR_munmap:
|
||||
+ case __NR_mremap:
|
||||
+ case __NR_membarrier:
|
||||
return true;
|
||||
case __NR_madvise:
|
||||
case __NR_mincore:
|
||||
@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
|
||||
case __NR_modify_ldt:
|
||||
#endif
|
||||
case __NR_mprotect:
|
||||
- case __NR_mremap:
|
||||
case __NR_msync:
|
||||
case __NR_munlockall:
|
||||
case __NR_readahead:
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
index 59d0eab8e..7ae700213 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
@@ -1063,4 +1063,8 @@
|
||||
#define __NR_memfd_create 279
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 283
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
index 1addd5384..d8811ce87 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
|
||||
@@ -1385,6 +1385,11 @@
|
||||
#define __NR_memfd_create (__NR_SYSCALL_BASE+385)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_SYSCALL_BASE+389)
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
// ARM private syscalls.
|
||||
#if !defined(__ARM_NR_BASE)
|
||||
#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
index ec75815a8..612fcfaa9 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h
|
||||
@@ -1271,4 +1271,8 @@
|
||||
#define __NR_memfd_create (__NR_Linux + 314)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_Linux + 318)
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
index ddbf97f3d..1742acd4c 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
|
||||
@@ -1433,4 +1433,8 @@
|
||||
#define __NR_memfd_create (__NR_Linux + 354)
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier (__NR_Linux + 358)
|
||||
+#endif
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
index a6afc62d9..6ab7740de 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
|
||||
@@ -1422,5 +1422,10 @@
|
||||
#define __NR_memfd_create 356
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 375
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
|
||||
|
||||
diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
index 349504aee..6a6d4756f 100644
|
||||
--- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h
|
||||
@@ -1290,5 +1290,10 @@
|
||||
#define __NR_memfd_create 319
|
||||
#endif
|
||||
|
||||
+#if !defined(__NR_membarrier)
|
||||
+#define __NR_membarrier 324
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
|
||||
index 7eb7c20ff..3bdc2eb39 100644
|
||||
--- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
|
||||
+++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h
|
||||
@@ -117,7 +117,7 @@
|
||||
#define HAVE_ACCESS 1
|
||||
|
||||
/* Define to 1 if you have the `canonicalize_file_name' function. */
|
||||
-#define HAVE_CANONICALIZE_FILE_NAME 1
|
||||
+// #define HAVE_CANONICALIZE_FILE_NAME 1
|
||||
|
||||
/* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
|
||||
/* #undef HAVE_CPU_TO_LE16 */
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
index 5b55c24..08cec52 100644
|
||||
--- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
+++ b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h
|
||||
@@ -273,7 +273,7 @@ union FloatContext {
|
||||
"Size mismatch");
|
||||
#elif defined(ARCH_CPU_ARMEL)
|
||||
static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
|
||||
-#if !defined(__GLIBC__)
|
||||
+#if defined(OS_ANDROID)
|
||||
static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
|
||||
#endif
|
||||
#elif defined(ARCH_CPU_ARM64)
|
|
@ -1,103 +0,0 @@
|
|||
--- qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
|
||||
+++ qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include <malloc.h>
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
// This translation unit defines a default dispatch for the allocator shim which
|
||||
// routes allocations to libc functions.
|
||||
// The code here is strongly inspired from tcmalloc's libc_override_glibc.h.
|
||||
@@ -73,3 +74,92 @@ const AllocatorDispatch AllocatorDispatch::default_dispatch = {
|
||||
nullptr, /* free_definite_size_function */
|
||||
nullptr, /* next */
|
||||
};
|
||||
+
|
||||
+#else // defined(__GLIBC__)
|
||||
+
|
||||
+#include <dlfcn.h>
|
||||
+
|
||||
+extern "C" {
|
||||
+// Declare function pointers to the memory functions
|
||||
+typedef void* (*t_libc_malloc)(size_t size);
|
||||
+typedef void* (*t_libc_calloc)(size_t n, size_t size);
|
||||
+typedef void* (*t_libc_realloc)(void* address, size_t size);
|
||||
+typedef void* (*t_libc_memalign)(size_t alignment, size_t size);
|
||||
+typedef void (*t_libc_free)(void* ptr);
|
||||
+typedef size_t (*t_libc_malloc_usable_size)(void* ptr);
|
||||
+
|
||||
+// Static instances of pointers to libc.so dl symbols
|
||||
+static t_libc_malloc libc_malloc = NULL;
|
||||
+static t_libc_calloc libc_calloc = NULL;
|
||||
+static t_libc_realloc libc_realloc = NULL;
|
||||
+static t_libc_memalign libc_memalign = NULL;
|
||||
+static t_libc_free libc_free = NULL;
|
||||
+static t_libc_malloc_usable_size libc_malloc_usable_size = NULL;
|
||||
+
|
||||
+// resolve the symbols in libc.so
|
||||
+void musl_libc_memory_init(void)
|
||||
+{
|
||||
+ libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc");
|
||||
+ libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc");
|
||||
+ libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc");
|
||||
+ libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign");
|
||||
+ libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free");
|
||||
+ libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size");
|
||||
+}
|
||||
+} // extern "C"
|
||||
+
|
||||
+namespace {
|
||||
+
|
||||
+using base::allocator::AllocatorDispatch;
|
||||
+
|
||||
+void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) {
|
||||
+ if (!libc_malloc)
|
||||
+ musl_libc_memory_init();
|
||||
+ return (*libc_malloc)(size);
|
||||
+}
|
||||
+
|
||||
+void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) {
|
||||
+ if (!libc_calloc)
|
||||
+ musl_libc_memory_init();
|
||||
+ return (*libc_calloc)(n, size);
|
||||
+}
|
||||
+
|
||||
+void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) {
|
||||
+ if (!libc_realloc)
|
||||
+ musl_libc_memory_init();
|
||||
+ return (*libc_realloc)(address, size);
|
||||
+}
|
||||
+
|
||||
+void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) {
|
||||
+ if (!libc_memalign)
|
||||
+ musl_libc_memory_init();
|
||||
+ return (*libc_memalign)(alignment, size);
|
||||
+}
|
||||
+
|
||||
+void MuslFree(const AllocatorDispatch*, void* address, void* context) {
|
||||
+ if (!libc_free)
|
||||
+ musl_libc_memory_init();
|
||||
+ (*libc_free)(address);
|
||||
+}
|
||||
+
|
||||
+size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) {
|
||||
+ // TODO(siggi, primiano): malloc_usable_size may need redirection in the
|
||||
+ // presence of interposing shims that divert allocations.
|
||||
+ if (!libc_malloc_usable_size)
|
||||
+ musl_libc_memory_init();
|
||||
+ return (*libc_malloc_usable_size)(address);
|
||||
+}
|
||||
+
|
||||
+} // namespace
|
||||
+
|
||||
+const AllocatorDispatch AllocatorDispatch::default_dispatch = {
|
||||
+ &MuslMalloc, /* alloc_function */
|
||||
+ &MuslCalloc, /* alloc_zero_initialized_function */
|
||||
+ &MuslMemalign, /* alloc_aligned_function */
|
||||
+ &MuslRealloc, /* realloc_function */
|
||||
+ &MuslFree, /* free_function */
|
||||
+ &MuslGetSizeEstimate, /* get_size_estimate_function */
|
||||
+ nullptr, /* next */
|
||||
+};
|
||||
+
|
||||
+#endif
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/v8/src/base/cpu.cc b/src/3rdparty/chromium/v8/src/base/cpu.cc
|
||||
index 4f4ac2b..c32239b 100644
|
||||
--- a/src/3rdparty/chromium/v8/src/base/cpu.cc
|
||||
+++ b/src/3rdparty/chromium/v8/src/base/cpu.cc
|
||||
@@ -17,7 +17,7 @@ extern "C" char** environ;
|
||||
#if V8_OS_QNX
|
||||
#include <sys/syspage.h> // cpuinfo
|
||||
#endif
|
||||
-#if (V8_OS_LINUX && V8_HOST_ARCH_PPC) || V8_OS_ANDROID
|
||||
+#if (V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_ARM)) || V8_OS_ANDROID
|
||||
#include <elf.h>
|
||||
#endif
|
||||
#if V8_OS_AIX
|
|
@ -1,108 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc
|
||||
index d8ca822d9..f6f3d9c69 100644
|
||||
--- a/src/3rdparty/chromium/base/debug/stack_trace.cc
|
||||
+++ b/src/3rdparty/chromium/base/debug/stack_trace.cc
|
||||
@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const {
|
||||
}
|
||||
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
|
||||
std::stringstream stream;
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
OutputToStreamWithPrefix(&stream, prefix_string);
|
||||
#endif
|
||||
return stream.str();
|
||||
}
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
|
||||
-#if !defined(__UCLIBC__) & !defined(_AIX)
|
||||
+#if defined(__GLIBC__) & !defined(_AIX)
|
||||
s.OutputToStream(&os);
|
||||
#else
|
||||
os << "StackTrace::OutputToStream not implemented.";
|
||||
diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
|
||||
index f4ddf9c1e..aef993613 100644
|
||||
--- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
|
||||
+++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc
|
||||
@@ -27,7 +27,7 @@
|
||||
#if !defined(USE_SYMBOLIZE)
|
||||
#include <cxxabi.h>
|
||||
#endif
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
|
||||
@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) {
|
||||
// Note: code in this function is NOT async-signal safe (std::string uses
|
||||
// malloc internally).
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
std::string::size_type search_from = 0;
|
||||
while (search_from < text->size()) {
|
||||
// Look for the start of a mangled symbol, from search_from.
|
||||
@@ -123,7 +123,7 @@ void DemangleSymbols(std::string* text) {
|
||||
search_from = mangled_start + 2;
|
||||
}
|
||||
}
|
||||
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#endif // defined(__GLIBC__) && !defined(_AIX)
|
||||
}
|
||||
#endif // !defined(USE_SYMBOLIZE)
|
||||
|
||||
@@ -135,7 +135,7 @@ class BacktraceOutputHandler {
|
||||
virtual ~BacktraceOutputHandler() = default;
|
||||
};
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
|
||||
// This should be more than enough to store a 64-bit number in hex:
|
||||
// 16 hex digits + 1 for null-terminator.
|
||||
@@ -218,7 +218,7 @@ void ProcessBacktrace(void* const* trace,
|
||||
}
|
||||
#endif // defined(USE_SYMBOLIZE)
|
||||
}
|
||||
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#endif // defined(__GLIBC__) && !defined(_AIX)
|
||||
|
||||
void PrintToStderr(const char* output) {
|
||||
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||
@@ -834,7 +834,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
|
||||
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||
// stack dumping signal handler). NO malloc or stdio is allowed here.
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
// Though the backtrace API man page does not list any possible negative
|
||||
// return values, we take no chance.
|
||||
return base::saturated_cast<size_t>(backtrace(trace, count));
|
||||
@@ -847,13 +847,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
|
||||
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||||
// stack dumping signal handler). NO malloc or stdio is allowed here.
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
PrintBacktraceOutputHandler handler;
|
||||
ProcessBacktrace(trace_, count_, prefix_string, &handler);
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if defined(__GLIBC__) && !defined(_AIX)
|
||||
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
|
||||
const char* prefix_string) const {
|
||||
StreamBacktraceOutputHandler handler(os);
|
||||
diff --git a/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc
|
||||
index 4c4bfa6af..0ca5c2159 100644
|
||||
--- a/src/3rdparty/chromium/base/logging.cc
|
||||
+++ b/src/3rdparty/chromium/base/logging.cc
|
||||
@@ -618,7 +618,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity,
|
||||
|
||||
LogMessage::~LogMessage() {
|
||||
size_t stack_start = stream_.tellp();
|
||||
-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \
|
||||
+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \
|
||||
!defined(OS_AIX)
|
||||
if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) {
|
||||
// Include a stack trace on a fatal, unless a debugger is attached.
|
|
@ -1,48 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
index 052ce37..95b0fb4 100644
|
||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||
@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||
}
|
||||
|
||||
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||
- const struct _libc_fpstate* fp) {
|
||||
+ const struct _fpstate* fp) {
|
||||
const greg_t* regs = uc->uc_mcontext.gregs;
|
||||
|
||||
out->context_flags = MD_CONTEXT_X86_FULL |
|
||||
@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||
}
|
||||
|
||||
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||
- const struct _libc_fpstate* fpregs) {
|
||||
+ const struct _fpstate* fpregs) {
|
||||
const greg_t* regs = uc->uc_mcontext.gregs;
|
||||
|
||||
out->context_flags = MD_CONTEXT_AMD64_FULL;
|
||||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
index f830618..f3dde1f 100644
|
||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||
@@ -50,7 +50,7 @@ struct UContextReader {
|
||||
// info: the collection of register structures.
|
||||
#if defined(__i386__) || defined(__x86_64)
|
||||
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||
- const struct _libc_fpstate* fp);
|
||||
+ const struct _fpstate* fp);
|
||||
#elif defined(__aarch64__)
|
||||
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||
const struct fpsimd_context* fpregs);
|
||||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
index d1dc331..d1cc562 100644
|
||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||
@@ -48,7 +48,7 @@ class ExceptionHandler;
|
||||
#if defined(__aarch64__)
|
||||
typedef struct fpsimd_context fpstate_t;
|
||||
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||||
-typedef struct _libc_fpstate fpstate_t;
|
||||
+typedef struct _fpstate fpstate_t;
|
||||
#endif
|
||||
|
||||
// These entries store a list of memory regions that the client wants included
|
|
@ -1,43 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
||||
index 044bd8d24..0f2526a3d 100644
|
||||
--- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
||||
+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc
|
||||
@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() {
|
||||
malloc_statistics_t stats = {0};
|
||||
malloc_zone_statistics(nullptr, &stats);
|
||||
return stats.size_in_use;
|
||||
-#elif defined(OS_LINUX) || defined(OS_ANDROID)
|
||||
+#elif (defined(OS_LINUX) && defined(__GLIBC__)) || defined(OS_ANDROID)
|
||||
struct mallinfo minfo = mallinfo();
|
||||
#if BUILDFLAG(USE_TCMALLOC)
|
||||
return minfo.uordblks;
|
||||
#else
|
||||
return minfo.hblkhd + minfo.arena;
|
||||
#endif
|
||||
-#elif defined(OS_FUCHSIA)
|
||||
+#else //if defined(OS_FUCHSIA) // also musl doesn't do this.
|
||||
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
||||
return 0;
|
||||
#endif
|
||||
diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
||||
index 7e42cfc20..5086b5c8a 100644
|
||||
--- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
||||
+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc
|
||||
@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
|
||||
}
|
||||
#elif defined(OS_FUCHSIA)
|
||||
// TODO(fuchsia): Port, see https://crbug.com/706592.
|
||||
-#else
|
||||
+#elif defined(__GLIBC__)
|
||||
struct mallinfo info = mallinfo();
|
||||
#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER)
|
||||
// Sanitizers override mallinfo.
|
||||
@@ -147,6 +147,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
|
||||
|
||||
// Total allocated space is given by |uordblks|.
|
||||
allocated_objects_size = info.uordblks;
|
||||
+#else
|
||||
+ // musl libc does not support mallinfo()
|
||||
#endif
|
||||
|
||||
MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc");
|
|
@ -1,10 +0,0 @@
|
|||
--- qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-05-26 14:58:54.000000000 +0200
|
||||
+++ qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-10-01 14:31:30.885000000 +0200
|
||||
@@ -21,6 +21,7 @@
|
||||
#define htons(x) _byteswap_ushort (x)
|
||||
#else
|
||||
#include <arpa/inet.h>
|
||||
+#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
|
||||
index 5d9c2e8..e81e7b4 100644
|
||||
--- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
|
||||
+++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h
|
||||
@@ -1794,6 +1794,15 @@ struct kernel_statfs {
|
||||
/* End of s390/s390x definitions */
|
||||
#endif
|
||||
|
||||
+#ifndef __GLIBC__
|
||||
+ /* For Musl libc pread/pread is the same as pread64/pwrite64 */
|
||||
+#ifndef __NR_pread
|
||||
+#define __NR_pread __NR_pread64
|
||||
+#endif
|
||||
+#ifndef __NR_pwrite
|
||||
+#define __NR_pwrite __NR_pwrite64
|
||||
+#endif
|
||||
+#endif /* ifndef __GLIBC__ */
|
||||
|
||||
/* After forking, we must make sure to only call system calls. */
|
||||
#if defined(__BOUNDED_POINTERS__)
|
|
@ -1,14 +0,0 @@
|
|||
--- qtwebengine/src/core/api/qtbug-61521.cpp 2017-11-29 09:42:29.000000000 +0100
|
||||
+++ qtwebengine/src/core/api/qtbug-61521.cpp 2018-01-28 06:49:29.454175725 +0100
|
||||
@@ -111,7 +111,11 @@
|
||||
}
|
||||
|
||||
SHIM_HIDDEN void* ShimPvalloc(size_t size) {
|
||||
+#if defined(__GLIBC__)
|
||||
return pvalloc(size);
|
||||
+#else
|
||||
+ return valloc((size+4095)&~4095);
|
||||
+#endif
|
||||
}
|
||||
|
||||
SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
|
|
@ -1,61 +0,0 @@
|
|||
--- qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-11-07 15:46:18.000000000 +0100
|
||||
+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-12-20 03:33:11.749059656 +0100
|
||||
@@ -9,6 +9,10 @@
|
||||
|
||||
#include <resolv.h>
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+#include "resolv_compat.h"
|
||||
+#endif
|
||||
+
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/macros.h"
|
||||
--- qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-11-07 15:46:18.000000000 +0100
|
||||
+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-12-20 03:40:07.671953098 +0100
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
+#if !defined(__GLIBC__)
|
||||
+#include "resolv_compat.h"
|
||||
+#endif
|
||||
+
|
||||
#include "base/bind.h"
|
||||
#include "base/files/file.h"
|
||||
#include "base/files/file_path.h"
|
||||
diff --git a/src/3rdparty/chromium/net/dns/resolv_compat.h b/src/3rdparty/chromium/net/dns/resolv_compat.h
|
||||
new file mode 100644
|
||||
index 0000000..4f0e852
|
||||
--- /dev/null
|
||||
+++ b/src/3rdparty/chromium/net/dns/resolv_compat.h
|
||||
@@ -0,0 +1,29 @@
|
||||
+#if !defined(__GLIBC__)
|
||||
+/***************************************************************************
|
||||
+ * resolv_compat.h
|
||||
+ *
|
||||
+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc
|
||||
+ * Note: res_init() is actually deprecated according to
|
||||
+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html
|
||||
+ **************************************************************************/
|
||||
+#include <string.h>
|
||||
+
|
||||
+static inline int res_ninit(res_state statp)
|
||||
+{
|
||||
+ int rc = res_init();
|
||||
+ if (statp != &_res) {
|
||||
+ memcpy(statp, &_res, sizeof(*statp));
|
||||
+ }
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
+static inline int res_nclose(res_state statp)
|
||||
+{
|
||||
+ if (!statp)
|
||||
+ return -1;
|
||||
+ if (statp != &_res) {
|
||||
+ memset(statp, 0, sizeof(*statp));
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif
|
|
@ -1,18 +0,0 @@
|
|||
There's a subtle difference in the internal name of siginfo_t fields
|
||||
between glibc and musl. The structure itself is equivalent, so it
|
||||
should suffice to add a macro to rename the field.
|
||||
|
||||
--- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-02-17 05:57:43.000000000 +0100
|
||||
+++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-06-03 08:20:25.032716427 +0200
|
||||
@@ -22,6 +22,11 @@
|
||||
#include "sandbox/linux/services/android_ucontext.h"
|
||||
#endif
|
||||
|
||||
+// musl libc defines siginfo_t __si_fields instead of _sifields
|
||||
+#if !defined(__GLIBC__)
|
||||
+#define _sifields __si_fields
|
||||
+#endif
|
||||
+
|
||||
namespace {
|
||||
|
||||
const int kCapacityIncrement = 20;
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||
index 10f1c0d..8e86a2e 100644
|
||||
--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||
+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
|
||||
@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() {
|
||||
// FIXME: On Mac OSX and Linux, this method cannot estimate stack size
|
||||
// correctly for the main thread.
|
||||
|
||||
-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||
defined(OS_FUCHSIA)
|
||||
// pthread_getattr_np() can fail if the thread is not invoked by
|
||||
// pthread_create() (e.g., the main thread of webkit_unit_tests).
|
||||
@@ -96,7 +96,7 @@ size_t GetUnderestimatedStackSize() {
|
||||
}
|
||||
|
||||
void* GetStackStart() {
|
||||
-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
|
||||
defined(OS_FUCHSIA)
|
||||
pthread_attr_t attr;
|
||||
int error;
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
|
||||
index d03c7a8..d43fda0 100644
|
||||
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
|
||||
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
|
||||
@@ -36,6 +36,9 @@
|
||||
#include <elf.h>
|
||||
#include <link.h>
|
||||
#include <stddef.h>
|
||||
+#ifndef __GLIBC__
|
||||
+#include <sys/reg.h>
|
||||
+#endif
|
||||
|
||||
#include "common/memory_range.h"
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
|
||||
index 02bf49b..05ee182 100644
|
||||
--- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
|
||||
+++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc
|
||||
@@ -13,7 +13,7 @@ namespace pp {
|
||||
namespace {
|
||||
|
||||
// Use 2MB default stack size for Native Client, otherwise use system default.
|
||||
-#if defined(__native_client__)
|
||||
+#if defined(__native_client__) || !defined(__GLIBC__)
|
||||
const size_t kDefaultStackSize = 2 * 1024 * 1024;
|
||||
#else
|
||||
const size_t kDefaultStackSize = 0;
|
||||
diff --git a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
|
||||
index cf7f3ec..e06a5ce 100644
|
||||
--- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
|
||||
+++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc
|
||||
@@ -761,7 +761,7 @@ void Thread::Start() {
|
||||
#if V8_OS_MACOSX
|
||||
// Default on Mac OS X is 512kB -- bump up to 1MB
|
||||
stack_size = 1 * 1024 * 1024;
|
||||
-#elif V8_OS_AIX
|
||||
+#elif V8_OS_AIX || !defined(__GLIBC__)
|
||||
// Default on AIX is 96kB -- bump up to 2MB
|
||||
stack_size = 2 * 1024 * 1024;
|
||||
#endif
|
|
@ -1,18 +0,0 @@
|
|||
Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality.
|
||||
However these parts work fine with Musl so there is no need to disable them.
|
||||
Just remove the check so it builds again. Since 5.15.1 is the last version of Qt to be released with this build system it'll be obsolete with Qt6 and there is no real point in fixing this upstream.
|
||||
|
||||
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
|
||||
index 1ca6214a..3783c223 100644
|
||||
--- a/src/buildtools/configure.json
|
||||
+++ b/src/buildtools/configure.json
|
||||
@@ -375,8 +375,7 @@
|
||||
&& features.webengine-python2
|
||||
&& (!config.sanitizer || features.webengine-sanitizer)
|
||||
&& (!config.linux || features.pkg-config)
|
||||
- && (!config.linux || features.webengine-host-pkg-config)
|
||||
- && (!config.linux || features.webengine-system-glibc)
|
||||
+ && (!config.linux || features.webengine-host-pkg-config)
|
||||
&& (!config.linux || features.webengine-system-khr)
|
||||
&& (!config.linux || features.webengine-system-nss)
|
||||
&& (!config.linux || features.webengine-system-dbus)
|
|
@ -1,24 +0,0 @@
|
|||
Allow SYS_sched_getparam and SYS_sched_getscheduler
|
||||
musl uses them for pthread_getschedparam()
|
||||
|
||||
source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
|
||||
|
||||
--- qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc 2019-11-12 20:48:20.013724661 +0100
|
||||
+++ qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.patched 2019-11-12 20:58:57.330695676 +0100
|
||||
@@ -93,10 +93,16 @@
|
||||
case __NR_sysinfo:
|
||||
case __NR_times:
|
||||
case __NR_uname:
|
||||
+#if !defined(__GLIBC__)
|
||||
+ case __NR_sched_getparam:
|
||||
+ case __NR_sched_getscheduler:
|
||||
+#endif
|
||||
return Allow();
|
||||
case __NR_sched_getaffinity:
|
||||
+#if defined(__GLIBC__)
|
||||
case __NR_sched_getparam:
|
||||
case __NR_sched_getscheduler:
|
||||
+#endif
|
||||
case __NR_sched_setscheduler:
|
||||
return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno);
|
||||
case __NR_prlimit64:
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h b/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h
|
||||
index 9e36539..f588083 100644
|
||||
--- a/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h
|
||||
+++ b/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h
|
||||
@@ -5,7 +5,7 @@
|
||||
#define CPP_PROG "gcc -E"
|
||||
|
||||
/* */
|
||||
-#define ENABLE_NLS 1
|
||||
+/* #undef ENABLE_NLS 1 */
|
||||
|
||||
/* Define to 1 if you have the `abort' function. */
|
||||
#define HAVE_ABORT 1
|
|
@ -1,43 +0,0 @@
|
|||
# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
|
||||
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
|
||||
# Contributor: Timo Teräs <timo.teras@iki.fi>
|
||||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=youtube-dlc
|
||||
pkgver=2020.11.10
|
||||
pkgrel=0
|
||||
pkgdesc="Command-line program to download videos from YouTube"
|
||||
url="https://youtube-dl.org/"
|
||||
arch="noarch"
|
||||
license="Unlicense"
|
||||
depends="python3 py3-setuptools"
|
||||
checkdepends="py3-flake8 py3-nose"
|
||||
subpackages="$pkgname-doc
|
||||
$pkgname-bash-completion
|
||||
$pkgname-fish-completion"
|
||||
source="yt-dlc-$pkgver.tar.gz::https://github.com/blackjack4494/yt-dlc/archive/$pkgver.tar.gz"
|
||||
provides="youtube-dl"
|
||||
builddir="$srcdir/yt-dlc-$pkgver"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
sed -i \
|
||||
-e 's|etc/bash_completion.d|share/bash-completion/completions|' \
|
||||
-e 's|etc/fish/completions|share/fish/completions|' \
|
||||
setup.py
|
||||
}
|
||||
|
||||
build() {
|
||||
python3 setup.py build
|
||||
}
|
||||
|
||||
check() {
|
||||
PYTHON=/usr/bin/python3 make offlinetest
|
||||
}
|
||||
|
||||
package() {
|
||||
python3 setup.py install --prefix=/usr --root="$pkgdir"
|
||||
ln -s youtube-dlc "$pkgdir"/usr/bin/youtube-dl
|
||||
}
|
||||
|
||||
sha512sums="5b732c421861ca5913fc712aa41a8dea428061b85d5fc6ea4c557d0c37b5a734eeec5490cd19bbe1c43ef48bba211969008c82677f9ff44fabfb08762b2ae185 yt-dlc-2020.11.10.tar.gz"
|
|
@ -1,55 +0,0 @@
|
|||
From ab11be0becb90542f10d5713659b559842c53af2 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Tue, 29 Mar 2016 15:15:17 +0200
|
||||
Subject: [PATCH] libavutil: clean up unused FF_SYMVER macro
|
||||
|
||||
There is nothing using it since commit d63443b9 (lavc: drop the
|
||||
av_fast_{re,m}alloc compatibility wrappers).
|
||||
|
||||
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
|
||||
---
|
||||
libavutil/internal.h | 28 ----------------------------
|
||||
1 file changed, 28 deletions(-)
|
||||
|
||||
diff --git a/libavutil/internal.h b/libavutil/internal.h
|
||||
index 61784b5..69d63d5 100644
|
||||
--- a/libavutil/internal.h
|
||||
+++ b/libavutil/internal.h
|
||||
@@ -187,34 +187,6 @@
|
||||
#endif
|
||||
|
||||
/**
|
||||
- * Define a function with only the non-default version specified.
|
||||
- *
|
||||
- * On systems with ELF shared libraries, all symbols exported from
|
||||
- * FFmpeg libraries are tagged with the name and major version of the
|
||||
- * library to which they belong. If a function is moved from one
|
||||
- * library to another, a wrapper must be retained in the original
|
||||
- * location to preserve binary compatibility.
|
||||
- *
|
||||
- * Functions defined with this macro will never be used to resolve
|
||||
- * symbols by the build-time linker.
|
||||
- *
|
||||
- * @param type return type of function
|
||||
- * @param name name of function
|
||||
- * @param args argument list of function
|
||||
- * @param ver version tag to assign function
|
||||
- */
|
||||
-#if HAVE_SYMVER_ASM_LABEL
|
||||
-# define FF_SYMVER(type, name, args, ver) \
|
||||
- type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver); \
|
||||
- type ff_##name args
|
||||
-#elif HAVE_SYMVER_GNU_ASM
|
||||
-# define FF_SYMVER(type, name, args, ver) \
|
||||
- __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver); \
|
||||
- type ff_##name args; \
|
||||
- type ff_##name args
|
||||
-#endif
|
||||
-
|
||||
-/**
|
||||
* Return NULL if a threading library has not been enabled.
|
||||
* Used to disable threading functions in AVCodec definitions
|
||||
* when not needed.
|
||||
--
|
||||
2.7.4
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3
|
||||
From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001
|
||||
From: Lynne <dev@lynne.ee>
|
||||
Date: Tue, 7 Jul 2020 16:01:58 +0100
|
||||
Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value
|
||||
|
||||
We return 0 for this particular architecture but should instead be
|
||||
returning the number of lines.
|
||||
Fixes users who check the return value matches what they expect.
|
||||
---
|
||||
libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++---------------
|
||||
libswscale/aarch64/yuv2rgb_neon.S | 2 ++
|
||||
2 files changed, 16 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c
|
||||
index 551daad9e353..c7a2a1037df8 100644
|
||||
--- a/libswscale/aarch64/swscale_unscaled.c
|
||||
+++ b/libswscale/aarch64/swscale_unscaled.c
|
||||
@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
|
||||
uint8_t *dst[], int dstStride[]) { \
|
||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||
\
|
||||
- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
- dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
- src[0], srcStride[0], \
|
||||
- src[1], srcStride[1], \
|
||||
- src[2], srcStride[2], \
|
||||
- yuv2rgb_table, \
|
||||
- c->yuv2rgb_y_offset >> 6, \
|
||||
- c->yuv2rgb_y_coeff); \
|
||||
- return 0; \
|
||||
+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
+ src[0], srcStride[0], \
|
||||
+ src[1], srcStride[1], \
|
||||
+ src[2], srcStride[2], \
|
||||
+ yuv2rgb_table, \
|
||||
+ c->yuv2rgb_y_offset >> 6, \
|
||||
+ c->yuv2rgb_y_coeff); \
|
||||
} \
|
||||
|
||||
#define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \
|
||||
@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
|
||||
uint8_t *dst[], int dstStride[]) { \
|
||||
const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \
|
||||
\
|
||||
- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
- dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
- src[0], srcStride[0], src[1], srcStride[1], \
|
||||
- yuv2rgb_table, \
|
||||
- c->yuv2rgb_y_offset >> 6, \
|
||||
- c->yuv2rgb_y_coeff); \
|
||||
- \
|
||||
- return 0; \
|
||||
+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \
|
||||
+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \
|
||||
+ src[0], srcStride[0], src[1], srcStride[1], \
|
||||
+ yuv2rgb_table, \
|
||||
+ c->yuv2rgb_y_offset >> 6, \
|
||||
+ c->yuv2rgb_y_coeff); \
|
||||
} \
|
||||
|
||||
#define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \
|
||||
diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
|
||||
index b7446aa10511..f4b220fb608e 100644
|
||||
--- a/libswscale/aarch64/yuv2rgb_neon.S
|
||||
+++ b/libswscale/aarch64/yuv2rgb_neon.S
|
||||
@@ -142,6 +142,7 @@
|
||||
.macro declare_func ifmt ofmt
|
||||
function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||
load_args_\ifmt
|
||||
+ mov w9, w1
|
||||
1:
|
||||
mov w8, w0 // w8 = width
|
||||
2:
|
||||
@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
|
||||
increment_\ifmt
|
||||
subs w1, w1, #1 // height -= 1
|
||||
b.gt 1b
|
||||
+ mov w0, w9
|
||||
ret
|
||||
endfunc
|
||||
.endm
|
|
@ -1,194 +0,0 @@
|
|||
# Contributor: Sergei Lukin <sergej.lukin@gmail.com>
|
||||
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
|
||||
# Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
|
||||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=ffmpeg
|
||||
pkgver=4.3.1
|
||||
pkgrel=0
|
||||
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
|
||||
url="https://ffmpeg.org/"
|
||||
arch="all"
|
||||
license="GPL-2.0-or-later AND LGPL-2.1-or-later"
|
||||
options="!check" # tests/data/hls-lists.append.m3u8 fails
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
|
||||
makedepends="
|
||||
alsa-lib-dev
|
||||
coreutils
|
||||
bzip2-dev
|
||||
gnutls-dev
|
||||
imlib2-dev
|
||||
lame-dev
|
||||
libass-dev
|
||||
libssh-dev
|
||||
libtheora-dev
|
||||
libva-dev
|
||||
libvdpau-dev
|
||||
libvorbis-dev
|
||||
libvpx-dev
|
||||
libxfixes-dev
|
||||
opus-dev
|
||||
perl-dev
|
||||
pulseaudio-dev
|
||||
sdl2-dev
|
||||
v4l-utils-dev
|
||||
x264-dev
|
||||
x265-dev
|
||||
xvidcore-dev
|
||||
yasm
|
||||
zlib-dev
|
||||
dav1d-dev
|
||||
vidstab-dev
|
||||
vulkan-loader-dev
|
||||
"
|
||||
checkdepends="rsync"
|
||||
source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
|
||||
0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
|
||||
3e098cca6e51db0f19928c12d0348deaa17137b3.patch
|
||||
"
|
||||
|
||||
# secfixes:
|
||||
# 4.3.1-r0:
|
||||
# - CVE-2020-14212
|
||||
# 4.3-r0:
|
||||
# - CVE-2020-13904
|
||||
# - CVE-2020-12284
|
||||
# 4.2.1-r0:
|
||||
# - CVE-2019-15942
|
||||
# 4.2-r0:
|
||||
# - CVE-2019-17539
|
||||
# - CVE-2019-17542
|
||||
# 4.1.4-r0:
|
||||
# - CVE-2019-12730
|
||||
# 4.1.3-r0:
|
||||
# - CVE-2019-9718
|
||||
# - CVE-2019-9721
|
||||
# - CVE-2019-11338
|
||||
# - CVE-2019-11339
|
||||
# 4.1.1-r0:
|
||||
# - CVE-2019-1000016
|
||||
# 4.1-r0:
|
||||
# - CVE-2018-13305
|
||||
# - CVE-2018-15822
|
||||
# 4.0.2-r0:
|
||||
# - CVE-2018-13301
|
||||
# - CVE-2018-13303
|
||||
# - CVE-2018-13304
|
||||
# - CVE-2018-1999010
|
||||
# - CVE-2018-1999011
|
||||
# - CVE-2018-1999012
|
||||
# - CVE-2018-1999013
|
||||
# - CVE-2018-1999014
|
||||
# - CVE-2018-1999015
|
||||
# 4.0.1-r0:
|
||||
# - CVE-2018-12459
|
||||
# - CVE-2018-12460
|
||||
# 4.0.0-r0:
|
||||
# - CVE-2018-6912
|
||||
# - CVE-2018-7757
|
||||
# - CVE-2018-9841
|
||||
# 3.4.4-r0:
|
||||
# - CVE-2018-14395
|
||||
# 3.4.3-r0:
|
||||
# - CVE-2018-7557
|
||||
# - CVE-2018-7751
|
||||
# - CVE-2018-10001
|
||||
# - CVE-2018-12458
|
||||
# - CVE-2018-13300
|
||||
# - CVE-2018-13302
|
||||
# - CVE-2018-14394
|
||||
# 3.3.4-r0:
|
||||
# - CVE-2017-14054
|
||||
# - CVE-2017-14055
|
||||
# - CVE-2017-14056
|
||||
# - CVE-2017-14057
|
||||
# - CVE-2017-14058
|
||||
# - CVE-2017-14059
|
||||
# - CVE-2017-14169
|
||||
# - CVE-2017-14170
|
||||
# - CVE-2017-14171
|
||||
# - CVE-2017-14222
|
||||
# - CVE-2017-14223
|
||||
# - CVE-2017-14225
|
||||
|
||||
# add support for AV1 codec for all archies except armhf and armv7
|
||||
# as aom is not available on them
|
||||
_aom="";
|
||||
|
||||
case "$CARCH" in
|
||||
x86|x86_64|aarch64|ppc64le|s390x )
|
||||
_aom="--enable-libaom"; makedepends="$makedepends aom-dev" ;;
|
||||
esac
|
||||
|
||||
build() {
|
||||
local _dbg="--disable-debug"
|
||||
local _asm=""
|
||||
[ -n "$DEBUG" ] && _dbg="--enable-debug"
|
||||
|
||||
case "$CARCH" in
|
||||
x86) _asm="--disable-asm" ;;
|
||||
mips*) _asm="--disable-asm --disable-inline-asm --disable-mipsdsp --disable-mipsdspr2 --disable-msa --disable-msa2 --disable-mipsfpu --disable-mips64r6 --disable-mips64r2" ;;
|
||||
esac
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--enable-avresample \
|
||||
--enable-avfilter \
|
||||
--enable-gnutls \
|
||||
--enable-gpl \
|
||||
--enable-libass \
|
||||
--enable-libmp3lame \
|
||||
--enable-libvorbis \
|
||||
--enable-libvpx \
|
||||
--enable-libxvid \
|
||||
--enable-libx264 \
|
||||
--enable-libx265 \
|
||||
--enable-libtheora \
|
||||
--enable-libv4l2 \
|
||||
--enable-libdav1d \
|
||||
--enable-postproc \
|
||||
--enable-pic \
|
||||
--enable-pthreads \
|
||||
--enable-shared \
|
||||
--enable-libxcb \
|
||||
--enable-libssh \
|
||||
--enable-libpulse \
|
||||
--enable-libvidstab \
|
||||
--disable-stripping \
|
||||
--disable-static \
|
||||
--disable-librtmp \
|
||||
--enable-vaapi \
|
||||
--enable-vdpau \
|
||||
--enable-libopus \
|
||||
--enable-vulkan \
|
||||
$_asm $_aom $_dbg
|
||||
make
|
||||
${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c
|
||||
make doc/ffmpeg.1 doc/ffplay.1
|
||||
}
|
||||
|
||||
# https://ffmpeg.org/fate.html
|
||||
check() {
|
||||
./configure \
|
||||
--samples=fate-suite/
|
||||
make fate-rsync
|
||||
make fate-list
|
||||
make fate
|
||||
}
|
||||
|
||||
package() {
|
||||
make DESTDIR="$pkgdir" install install-man
|
||||
install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
|
||||
# strip --strip-debug "$pkgdir"/usr/lib/*.a
|
||||
}
|
||||
|
||||
libs() {
|
||||
pkgdesc="Libraries for ffmpeg"
|
||||
replaces="ffmpeg"
|
||||
mkdir -p "$subpkgdir"/usr
|
||||
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
|
||||
}
|
||||
|
||||
sha512sums="64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f ffmpeg-4.3.1.tar.xz
|
||||
1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
|
||||
7151e98829c215619b82e27fdff98b9a0d6a778f499170f3688e111a8bf7b2cc8895f09aa49bcb812ba5b5f06dd0243ebc79c31af246420f7d0869859b4a0241 3e098cca6e51db0f19928c12d0348deaa17137b3.patch"
|
|
@ -1,83 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=gst-plugins-good
|
||||
pkgver=1.16.2
|
||||
pkgrel=5
|
||||
pkgdesc="GStreamer streaming media framework good plug-ins"
|
||||
url="https://gstreamer.freedesktop.org"
|
||||
arch="all"
|
||||
license="GPL-2.0-or-later LGPL-2.0-or-later"
|
||||
subpackages="$pkgname-lang $pkgname-gtk"
|
||||
replaces="gst-plugins-good1"
|
||||
makedepends="cairo-dev flac-dev gdk-pixbuf-dev glib-dev gst-plugins-base-dev
|
||||
gstreamer-dev gtk+3.0-dev jack-dev lame-dev libavc1394-dev libcaca-dev
|
||||
libdv-dev libgudev-dev libice-dev libiec61883-dev libjpeg-turbo-dev
|
||||
libogg-dev libpng-dev libshout-dev libsm-dev libsoup-dev libvpx-dev
|
||||
libxdamage-dev libxext-dev libxv-dev linux-headers meson mpg123-dev
|
||||
orc-compiler orc-dev taglib-dev v4l-utils-dev wavpack-dev zlib-dev
|
||||
pulseaudio-dev"
|
||||
ldpath="/usr/lib/gstreamer-1.0"
|
||||
source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz"
|
||||
options="!check" # elements/souphttpsrc fails
|
||||
|
||||
case "$CARCH" in
|
||||
armhf) ;;
|
||||
*)
|
||||
makedepends="$makedepends qt5-qtdeclarative-dev qt5-qtx11extras-dev"
|
||||
subpackages="$subpackages $pkgname-qt"
|
||||
;;
|
||||
esac
|
||||
|
||||
# secfixes:
|
||||
# 1.10.4-r0:
|
||||
# - CVE-2017-5840
|
||||
# - CVE-2017-5841
|
||||
# - CVE-2017-5845
|
||||
# - CVE-2016-9634
|
||||
# - CVE-2016-9635
|
||||
# - CVE-2016-9636
|
||||
# - CVE-2016-9808
|
||||
# - CVE-2016-10198
|
||||
# - CVE-2016-10199
|
||||
|
||||
build() {
|
||||
abuild-meson \
|
||||
-Dpackage-origin="https://alpinelinux.org" \
|
||||
-Dpackage-name="GStreamer good plug-ins (Alpine Linux)" \
|
||||
. output
|
||||
meson compile ${JOBS:+-j ${JOBS}} -C output
|
||||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C output
|
||||
}
|
||||
|
||||
_mv() {
|
||||
mkdir -p "$subpkgdir"/"$ldpath"
|
||||
mv "$1" "$subpkgdir"/"$ldpath"
|
||||
}
|
||||
|
||||
qt() {
|
||||
pkgdesc="Gstreamer Qt plug-in"
|
||||
find "$pkgdir" -type f | while read -r i; do
|
||||
if ldd $i 2>/dev/null | grep -q "libQt"; then
|
||||
_mv "$i"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
gtk() {
|
||||
pkgdesc="Gstreamer gtk-3 plug-in"
|
||||
find "$pkgdir" -type f | while read -r i; do
|
||||
if ldd $i 2>/dev/null | grep -q "libgtk-3"; then
|
||||
_mv "$i"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
sha512sums="ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4 gst-plugins-good-1.16.2.tar.xz"
|
|
@ -1,41 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Bart Ribbers <bribbers@disroot.org>
|
||||
pkgname=qt5-qtmultimedia
|
||||
pkgver=5.15.1
|
||||
pkgrel=0
|
||||
pkgdesc="Qt5 - Multimedia support"
|
||||
url="https://www.qt.io/developers/"
|
||||
arch="all !armhf" # armhf blocked by qt5-qtdeclarative
|
||||
license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
|
||||
makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev libxv-dev pulseaudio-dev
|
||||
gstreamer-dev gst-plugins-base-dev gst-plugins-bad-dev"
|
||||
subpackages="$pkgname-dev"
|
||||
builddir="$srcdir/qtmultimedia-everywhere-src-$pkgver"
|
||||
|
||||
case $pkgver in
|
||||
*_beta*|*_rc*) _rel=development_releases;;
|
||||
*) _rel=official_releases;;
|
||||
esac
|
||||
|
||||
source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtmultimedia-everywhere-src-$pkgver.tar.xz"
|
||||
|
||||
build() {
|
||||
qmake-qt5
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
}
|
||||
package() {
|
||||
make INSTALL_ROOT="$pkgdir" install
|
||||
|
||||
# Drop QMAKE_PRL_BUILD_DIR because reference the build dir
|
||||
find "$pkgdir/usr/lib" -type f -name '*.prl' \
|
||||
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
|
||||
|
||||
install -d "$pkgdir"/usr/share/licenses
|
||||
ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname
|
||||
}
|
||||
|
||||
sha512sums="9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9 qtmultimedia-everywhere-src-5.15.1.tar.xz"
|
|
@ -1,19 +0,0 @@
|
|||
diff --git a/abuild.in b/abuild.in
|
||||
index d600e92..923c60f 100644
|
||||
--- a/abuild.in
|
||||
+++ b/abuild.in
|
||||
@@ -458,7 +458,13 @@ initdcheck() {
|
||||
local i line
|
||||
for i in $source; do
|
||||
case $i in
|
||||
- *.initd) line=$(head -n 1 "$srcdir"/$i);;
|
||||
+ *.initd)
|
||||
+ if is_remote "$i"; then
|
||||
+ line=$(head -n 1 "$srcdir"/"$(filename_from_uri $i)")
|
||||
+ else
|
||||
+ line=$(head -n 1 "$srcdir"/$i)
|
||||
+ fi
|
||||
+ ;;
|
||||
*) continue ;;
|
||||
esac
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff --git a/abuild.in b/abuild.in
|
||||
index d600e92..74b3ae5 100644
|
||||
--- a/abuild.in
|
||||
+++ b/abuild.in
|
||||
@@ -2200,15 +2199,17 @@ builddeps() {
|
||||
[ -n "$nodeps" ] && return 0
|
||||
|
||||
msg "Analyzing dependencies..."
|
||||
- case "$BOOTSTRAP" in
|
||||
- no*) BUILD_BASE="";;
|
||||
- *) if cross_creating || cross_compiling; then
|
||||
- BUILD_BASE="build-base-$CTARGET_ARCH"
|
||||
- else
|
||||
- BUILD_BASE="build-base"
|
||||
- fi
|
||||
- esac
|
||||
- calcdeps "$BUILD_BASE"
|
||||
+ if ! options_has "!buildbase"; then
|
||||
+ case "$BOOTSTRAP" in
|
||||
+ no*) BUILD_BASE="";;
|
||||
+ *) if cross_creating || cross_compiling; then
|
||||
+ BUILD_BASE="build-base-$CTARGET_ARCH"
|
||||
+ else
|
||||
+ BUILD_BASE="build-base"
|
||||
+ fi
|
||||
+ esac
|
||||
+ calcdeps "$BUILD_BASE"
|
||||
+ fi
|
||||
|
||||
# find which deps are missing
|
||||
local mbd mhd missing
|
||||
@@ -2337,9 +2338,10 @@ rootbld() {
|
||||
echo "$REPODEST/$repo"
|
||||
) < "$repo_template" > "$BUILD_ROOT/etc/apk/repositories"
|
||||
|
||||
+ options_has "!buildbase" || builddeps="$builddeps build-base"
|
||||
calcdeps
|
||||
$SUDO_APK add --initdb --root "$BUILD_ROOT" --update \
|
||||
- abuild alpine-base build-base git $hostdeps $builddeps \
|
||||
+ abuild alpine-base git $hostdeps $builddeps \
|
||||
${USE_CCACHE:+ccache}
|
||||
|
||||
local bwrap_opts=""
|
|
@ -1,87 +0,0 @@
|
|||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=abuild
|
||||
pkgver=3.7.0_rc1
|
||||
_ver=${pkgver%_git*}
|
||||
pkgrel=1
|
||||
pkgdesc="Script to build Alpine Packages"
|
||||
url="https://git.alpinelinux.org/cgit/abuild/"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils
|
||||
attr tar pkgconf patch lzip"
|
||||
if [ "$CBUILD" = "$CHOST" ]; then
|
||||
depends="$depends curl"
|
||||
fi
|
||||
makedepends_build="pkgconfig"
|
||||
makedepends_host="openssl-dev zlib-dev"
|
||||
makedepends="$makedepends_host $makedepends_build"
|
||||
checkdepends="bats"
|
||||
install="$pkgname.pre-install $pkgname.pre-upgrade"
|
||||
subpackages="
|
||||
apkbuild-cpan:cpan:noarch
|
||||
apkbuild-gem-resolver:gems:noarch
|
||||
apkbuild-pypi:pypi:noarch
|
||||
abuild-rootbld:_rootbld:noarch
|
||||
$pkgname-doc
|
||||
"
|
||||
options="suid"
|
||||
pkggroups="abuild"
|
||||
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
|
||||
0001-fix-initd-checks.patch
|
||||
"
|
||||
builddir="$srcdir"/abuild-$pkgver
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
|
||||
}
|
||||
|
||||
build() {
|
||||
make VERSION="$pkgver-r$pkgrel"
|
||||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
|
||||
|
||||
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
|
||||
install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
|
||||
}
|
||||
|
||||
cpan() {
|
||||
pkgdesc="Script to generate perl APKBUILD from CPAN"
|
||||
depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
|
||||
perl-lwp-protocol-https"
|
||||
|
||||
mkdir -p "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
|
||||
}
|
||||
|
||||
gems() {
|
||||
pkgdesc="APKBUILD dependency resolver for RubyGems"
|
||||
depends="ruby ruby-augeas"
|
||||
|
||||
mkdir -p "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
|
||||
}
|
||||
|
||||
pypi() {
|
||||
pkgdesc="Script to generate python3 APKBUILD from PYPI"
|
||||
depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https"
|
||||
|
||||
mkdir -p "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/bin/apkbuild-pypi "$subpkgdir"/usr/bin/
|
||||
}
|
||||
|
||||
_rootbld() {
|
||||
pkgdesc="Build packages in chroot"
|
||||
depends="abuild bubblewrap gettext git"
|
||||
mkdir -p "$subpkgdir"
|
||||
}
|
||||
|
||||
sha512sums="ff0b7fd5e65b41185c0ec452703ecbcd73d409de75ffa14677ea9ed77919bc70347d53e42c6a3c6b569e260d2fb8bde495b151d9cf42adb097fe6b0764362248 abuild-3.7.0_rc1.tar.xz
|
||||
e19ce813d78a71621534f00745ce77050efe622954bf813bc251d892b8927c0ba08c5c8e77ffb18a8d647d2638698d94cf8fdb60a929c0713458f9b3e06ea3cf 0001-fix-initd-checks.patch"
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
addgroup -S abuild 2>/dev/null
|
||||
|
||||
exit 0
|
|
@ -1 +0,0 @@
|
|||
abuild.pre-install
|
|
@ -1,46 +0,0 @@
|
|||
From 59204d36985de5ba2444d5f3e0d50a119287ec51 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
|
||||
Date: Sat, 25 Jan 2020 12:04:32 +0100
|
||||
Subject: [PATCH] mkinitfs: add optional support for pigz
|
||||
|
||||
pigz(1) is a parallel gzip implementation. As such, it significantly
|
||||
faster than gzip(1). This patch uses pigz(1) instead of gzip(1),
|
||||
if it is installed, otherwise it just falls back to gzip(1). This is
|
||||
similar to the current pigz support in abuild.
|
||||
|
||||
Without this patch:
|
||||
|
||||
$ time mkinitfs
|
||||
==> initramfs: creating /boot/initramfs-lts
|
||||
real 0m 38.19s
|
||||
user 0m 35.47s
|
||||
sys 0m 0.49s
|
||||
|
||||
With this patch applied and pigz installed:
|
||||
|
||||
==> initramfs: creating /boot/initramfs-lts
|
||||
real 0m 13.24s
|
||||
user 0m 38.30s
|
||||
sys 0m 0.56s
|
||||
|
||||
This change was discussed on IRC with _ikke_ and mps.
|
||||
---
|
||||
mkinitfs.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mkinitfs.in b/mkinitfs.in
|
||||
index 9bd95f9..9676fce 100755
|
||||
--- a/mkinitfs.in
|
||||
+++ b/mkinitfs.in
|
||||
@@ -278,7 +278,7 @@ if [ -z "$list_sources" ] && [ -z "$quiet" ]; then
|
||||
fi
|
||||
|
||||
case "$initfscomp" in
|
||||
- gzip) comp="gzip -9" ;;
|
||||
+ gzip) comp="$(command -v pigz 2>/dev/null || echo gzip) -9" ;;
|
||||
xz) cmd_exists xz; comp="xz -C crc32 -T 0" ;;
|
||||
*) echo "Initramfs compression \"$initfscomp\" not supported!"; exit 1 ;;
|
||||
esac
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/mkinitfs.in b/mkinitfs.in
|
||||
index 9676fce..318c2f9 100755
|
||||
--- a/mkinitfs.in
|
||||
+++ b/mkinitfs.in
|
||||
@@ -147,6 +147,15 @@ initfs_apk_keys() {
|
||||
cp "${basedir}etc/apk/keys/"* "$tmpdir"/etc/apk/keys/
|
||||
}
|
||||
|
||||
+initfs_custom_files() {
|
||||
+ for file in "$custom_files"; do
|
||||
+ if [ -f "$basedir"/$file ]; then
|
||||
+ mkdir -p "$tmpdir"/${file%/*}
|
||||
+ cp "$basedir"/$file "$tmpdir"/$file
|
||||
+ fi
|
||||
+ done
|
||||
+}
|
||||
+
|
||||
initfs_cpio() {
|
||||
if [ -n "$list_sources" ]; then
|
||||
(cd "$tmpdir" && find . | sort)
|
||||
@@ -287,6 +296,7 @@ initfs_base \
|
||||
&& initfs_kmods \
|
||||
&& initfs_firmware \
|
||||
&& initfs_apk_keys \
|
||||
+ && initfs_custom_files \
|
||||
&& initfs_cpio
|
||||
rc=$?
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
diff --git a/features.d/cryptsetup.files b/features.d/cryptsetup.files
|
||||
index 902ce33..6ab9c19 100644
|
||||
--- a/features.d/cryptsetup.files
|
||||
+++ b/features.d/cryptsetup.files
|
||||
@@ -1 +1,2 @@
|
||||
/sbin/cryptsetup
|
||||
+/usr/lib/libgcc_s.so.1
|
|
@ -1,34 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=mkinitfs
|
||||
pkgver=3.4.5
|
||||
_ver=${pkgver%_git*}
|
||||
pkgrel=3
|
||||
pkgdesc="Tool to generate initramfs images for Alpine"
|
||||
url="https://git.alpinelinux.org/cgit/mkinitfs"
|
||||
arch="all"
|
||||
license="GPL-2.0-only"
|
||||
# currently we do not ship any testsuite
|
||||
options="!check"
|
||||
makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers"
|
||||
makedepends="$makedepends_host"
|
||||
depends="busybox>=1.28.2-r1 apk-tools>=2.9.1 lddtree>=1.25 kmod"
|
||||
subpackages="$pkgname-doc"
|
||||
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
|
||||
triggers="$pkgname.trigger=/usr/share/kernel/*"
|
||||
source="https://dev.alpinelinux.org/archive/mkinitfs/mkinitfs-$_ver.tar.xz
|
||||
0001-mkinitfs-add-optional-support-for-pigz.patch
|
||||
0002-file-embed.patch
|
||||
"
|
||||
|
||||
build() {
|
||||
make VERSION=$pkgver-r$pkgrel
|
||||
}
|
||||
|
||||
package() {
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
|
||||
sha512sums="e12f603dd9a51c0afbafeca7b4a061733514c4cf509b1dd61cc37c94e6102e5b3439d7a0379e1e4179aeaff13a382dab985c9737812e52803f038c1b2bb97cf8 mkinitfs-3.4.5.tar.xz
|
||||
50411c3cddbfc49837d750620c57393dc8dfa7beb91f02816345fd66c8068b12d9aef266e50fd7cdc2b3b5fa81f477cbfaed00a2b264055cfd34b61ceb03e63a 0001-mkinitfs-add-optional-support-for-pigz.patch
|
||||
83f6b283866da668b407d22e6fb7cceffec265e44daf5099e6cf83258176a9458265376d4dcc5d83f6f00992eceacd0284a8ad10f7651835749a603553d00810 0002-file-embed.patch"
|
|
@ -1,8 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# safety. if nlplug-findfs is missing in the initramfs image we may end up
|
||||
# with an unbootable system.
|
||||
|
||||
if ! grep -q -w /sbin/nlplug-findfs /etc/mkinitfs/features.d/base.files; then
|
||||
echo "/sbin/nlplug-findfs" >> /etc/mkinitfs/features.d/base.files
|
||||
fi
|
|
@ -1 +0,0 @@
|
|||
mkinitfs.post-install
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
mkdir -p /etc/mkinitfs/features.d
|
||||
for i in files modules; do
|
||||
for j in /etc/mkinitfs/$i.d/*; do
|
||||
[ -e "$j" ] || continue
|
||||
case "$j" in
|
||||
*.apk-new) continue;;
|
||||
esac
|
||||
mv $j /etc/mkinitfs/features.d/${j##*/}.$i
|
||||
done
|
||||
done
|
||||
exit 0
|
|
@ -1,33 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
for i in "$@"; do
|
||||
# get last element in path
|
||||
flavor=${i##*/}
|
||||
if ! [ -f "$i"/kernel.release ]; then
|
||||
# kernel was uninstalled
|
||||
rm -f $( readlink -f /boot/initramfs-$flavor ) \
|
||||
/boot/initramfs-$flavor /boot/vmlinuz-$flavor \
|
||||
/boot/$flavor /boot/$flavor.gz /$flavor /$flavor.gz
|
||||
continue
|
||||
fi
|
||||
abi_release=$(cat "$i"/kernel.release)
|
||||
initfs=initramfs-$flavor
|
||||
mkinitfs -o /boot/$initfs $abi_release
|
||||
done
|
||||
|
||||
# extlinux will use path relative partition, so if /boot is on a
|
||||
# separate partition we want /boot/<kernel> resolve to /<kernel>
|
||||
if ! [ -e /boot/boot ]; then
|
||||
ln -sf . /boot/boot 2>/dev/null # silence error in case of FAT
|
||||
fi
|
||||
|
||||
# cleanup unused initramfs
|
||||
for i in /boot/initramfs-[0-9]*; do
|
||||
[ -f $i ] || continue
|
||||
if ! [ -f /boot/vmlinuz-${i#/boot/initramfs-} ]; then
|
||||
rm "$i"
|
||||
fi
|
||||
done
|
||||
|
||||
sync
|
||||
exit 0
|
|
@ -1,24 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=uircd-openrc
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
pkgdesc="uIRCd service files"
|
||||
url="https://git.redxen.eu/RedXen"
|
||||
arch="noarch"
|
||||
license="none"
|
||||
depends="openrc"
|
||||
options="!check"
|
||||
source="
|
||||
initd
|
||||
confd
|
||||
"
|
||||
builddir="$srcdir"
|
||||
|
||||
package() {
|
||||
install -Dm755 initd "$pkgdir"/etc/init.d/uircd
|
||||
install -Dm644 confd "$pkgdir"/etc/conf.d/uircd
|
||||
}
|
||||
|
||||
sha512sums="ac39df79bc4a10a09146a9dbd1532ce86f90533e8db47dd57cab454878150c2966c1e47160cb1dcbfaef23a461923d1686818a9ef8751507911e2682b2d2c2c2 initd
|
||||
af5f1348e304849dab9287b1094bf1514923933e87d49b497a0bbe2c6e1c2fa82692a15536d9c57dfb027e34927befa096879f12a1d712c26198ce1eb4851632 confd"
|
|
@ -1,19 +0,0 @@
|
|||
command_user=caskd
|
||||
error_log="/home/${command_user}/IRC/daemon.log"
|
||||
uircd_verbosity=3
|
||||
uircd_quitmsg="Now on the move."
|
||||
uircd_logpath="/home/${command_user}/IRC"
|
||||
uircd_connections="
|
||||
caskd@localhost/7203,#testingrounds,#idletown,#programming
|
||||
caskd@41.157.98.109/9006,#general,#programming
|
||||
caskd@localhost/7205,#pinephone,#pine64
|
||||
caskd@localhost/7206,#alpine-linux,#C
|
||||
caskd@mbrserver.com,#general
|
||||
caskd@irc.quakenet.org,#xonotic
|
||||
caskd@localhost/7208
|
||||
caskd@localhost/7204,#unix
|
||||
caskd@localhost/7207,#alpine-linux,#pleroma
|
||||
caskd@localhost/7201,#cyberpunk,#cyberia,#2f30,#radio
|
||||
caskd@localhost/7209,#lokinet
|
||||
caskd@localhost/7202,#hackint,#nerdberg,#freifunk
|
||||
"
|
|
@ -1,30 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
description="microIRC daemon"
|
||||
supervisor=supervise-daemon
|
||||
command="/usr/local/bin/uircd"
|
||||
command_args=""
|
||||
pidfile="/run/${RC_SVCNAME}.pid"
|
||||
command_background=true
|
||||
uircd_logpath="${uircd_logpath:-/home/${command_user}/IRC}"
|
||||
|
||||
depend() {
|
||||
need networking
|
||||
want stunnel.irc
|
||||
}
|
||||
|
||||
optional_arg() {
|
||||
if [ -n "$2" ]; then
|
||||
command_args="$command_args $1 '$2'"
|
||||
fi
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
optional_arg "-V" "$uircd_verbosity"
|
||||
checkpath --directory --owner $command_user "$uircd_logpath"
|
||||
command_args="$command_args -l '$uircd_logpath'"
|
||||
optional_arg "-m" "$uircd_quitmsg"
|
||||
for i in $uircd_connections; do
|
||||
command_args="$command_args -c '$i'"
|
||||
done
|
||||
}
|
|
@ -0,0 +1,59 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer:
|
||||
pkgname=flexget
|
||||
pkgver=3.1.93
|
||||
pkgrel=0
|
||||
pkgdesc="Downloading or content processing automatition from different sources"
|
||||
url="http://www.flexget.com/"
|
||||
arch="noarch"
|
||||
license="MIT"
|
||||
depends="
|
||||
python3
|
||||
py3-feedparser
|
||||
py3-sqlalchemy
|
||||
py3-yaml
|
||||
py3-beautifulsoup4
|
||||
py3-html5lib
|
||||
py3-pyrss2gen
|
||||
# py3-pynzb
|
||||
# py3-rpyc
|
||||
py3-jinja2
|
||||
py3-requests
|
||||
py3-dateutil
|
||||
py3-jsonschema
|
||||
py3-guessit
|
||||
py3-rebulk
|
||||
# py3-apscheduler
|
||||
py3-terminaltables
|
||||
# py3-colorclass
|
||||
# py3-loguru
|
||||
py3-cherrypy
|
||||
py3-flask
|
||||
py3-flask-restful
|
||||
# py3-flask-restx
|
||||
# py3-flask-compress
|
||||
py3-flask-login
|
||||
# py3-flask-cors
|
||||
py3-parsing
|
||||
# py3-zxcvbn
|
||||
py3-progressbar
|
||||
py3-more-itertools
|
||||
"
|
||||
makedepends="
|
||||
py3-setuptools
|
||||
"
|
||||
options="!check"
|
||||
source="
|
||||
$pkgname-$pkgver.zip::https://github.com/Flexget/Flexget/archive/v$pkgver.zip
|
||||
"
|
||||
builddir="$srcdir/Flexget-$pkgver"
|
||||
|
||||
build() {
|
||||
python3 setup.py build
|
||||
}
|
||||
|
||||
package() {
|
||||
python3 setup.py install --root="$pkgdir"/ --prefix=/usr --optimize=1
|
||||
}
|
||||
|
||||
sha512sums="de2dc8bbcdeeb6d2fb19f73b30b1f88398c8b7e9b430be1b957fc0941b6c13e5dd81a39e0d45b33f0296d0a22d6db50d1cea9e61138e4f262b22758811f20158 flexget-3.1.93.zip"
|
|
@ -0,0 +1,48 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer:
|
||||
pkgname=hydrus
|
||||
pkgver=429
|
||||
pkgrel=0
|
||||
pkgdesc="Danbooru-like image tagging and searching system for the desktop"
|
||||
url="http://hydrusnetwork.github.io/hydrus/"
|
||||
arch="noarch"
|
||||
license="WTFPL"
|
||||
depends="
|
||||
python3
|
||||
opencv
|
||||
hdf5
|
||||
py3-beautifulsoup4
|
||||
py3-yaml
|
||||
py3-lz4
|
||||
py3-numpy
|
||||
py3-twisted
|
||||
py3-pillow
|
||||
py3-pysocks
|
||||
py3-psutil
|
||||
py3-html5lib
|
||||
py3-requests
|
||||
py3-mpv
|
||||
"
|
||||
makedepends=""
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://github.com/hydrusnetwork/hydrus/archive/v$pkgver.tar.gz
|
||||
client-bin
|
||||
"
|
||||
options="!check"
|
||||
builddir="$srcdir/hydrus-$pkgver"
|
||||
|
||||
build() {
|
||||
python3 -OO -m compileall -fq .
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"/usr/lib/hydrus/bin
|
||||
|
||||
cp -r help hydrus static client.pyw server.py "$pkgdir"/usr/lib/hydrus
|
||||
ln -s /usr/bin/ffmpeg "$pkgdir"/usr/lib/hydrus/bin/ffmpeg
|
||||
|
||||
install -Dm755 "$srcdir"/client-bin "$pkgdir"/usr/bin/hydrus-client
|
||||
}
|
||||
|
||||
sha512sums="3213ddfa62319cd82a067b7d63f32e631a476bff01aad3f2bb7ef21348fc61254e648a63bcfd6ecace8efcc8c5892518cbc43246527ecace991ff18f307cc4c2 hydrus-429.tar.gz
|
||||
e52105dcf6d769a4c451d20510d6f4a740db0b78cae67d86323b3448c1a3df861bb177bf5c8a52b7f02bd2240357de403fd3f32ddfdef77231013f5128af39ba client-bin"
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
exec python3 -OO /usr/lib/hydrus/client.pyw "$@"
|
|
@ -0,0 +1,16 @@
|
|||
--- a/config/prod.exs
|
||||
+++ b/config/prod.exs
|
||||
@@ -1,4 +1,4 @@
|
||||
-use Mix.Config
|
||||
+import Config
|
||||
|
||||
# For production, we often load configuration from external
|
||||
# sources, such as your system environment. For this reason,
|
||||
@@ -63,7 +63,3 @@
|
||||
|
||||
# Finally import the config/prod.secret.exs
|
||||
# which should be versioned separately.
|
||||
-import_config "prod.secret.exs"
|
||||
-
|
||||
-if File.exists?("./config/prod.exported_from_db.secret.exs"),
|
||||
- do: import_config("prod.exported_from_db.secret.exs")
|
|
@ -0,0 +1,35 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer:
|
||||
pkgname=pleroma
|
||||
pkgver=2.2.1
|
||||
pkgrel=0
|
||||
pkgdesc="Pleroma is a free, federated social networking server built on open protocols"
|
||||
url="https://pleroma.social/"
|
||||
arch="all"
|
||||
license="AGPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0"
|
||||
depends="/bin/sh"
|
||||
makedepends="cmake git file-dev elixir"
|
||||
options="net"
|
||||
source="
|
||||
https://git.pleroma.social/pleroma/pleroma/-/archive/v$pkgver/pleroma-v$pkgver.tar.gz
|
||||
0001-remove-config-import-build.patch
|
||||
"
|
||||
builddir="$srcdir/pleroma-v$pkgver"
|
||||
|
||||
build() {
|
||||
export MIX_ENV=prod
|
||||
mix local.rebar --force
|
||||
mix local.hex --force
|
||||
mix deps.get
|
||||
mix release --path buildout
|
||||
chmod +x buildout/bin/pleroma
|
||||
rm -rf buildout/installation # Fuck this
|
||||
}
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir"
|
||||
mv buildout "$pkgdir"/pleroma
|
||||
}
|
||||
|
||||
sha512sums="de10c3bb4968f6ce424f115aee4543cc5046fbc2e3dbea8918e6dcad7e32a1006a3b1d2080872ca35a86f7953e94a261f881817c34807775cd912424cf1bd3a4 pleroma-v2.2.1.tar.gz
|
||||
b0d16fa8b6e975f0a298104b93d0794f247ea8837c23de6381cc87f28cda5d86c9e12036e2cd8cb0a75c96f078db0693540d996786dfaab8ed9bb006aefd45f4 0001-remove-config-import-build.patch"
|
|
@ -1,9 +1,9 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer:
|
||||
pkgname=spigot
|
||||
pkgver=1.16.5
|
||||
pkgrel=0
|
||||
_buildno=124
|
||||
_buildno=126
|
||||
pkgdesc="Spigot server implementation"
|
||||
url="https://www.spigotmc.org/wiki/buildtools/#linux"
|
||||
arch="noarch"
|
||||
|
@ -32,5 +32,5 @@ package() {
|
|||
install -Dm644 "$builddir"/spigot-$pkgver.jar "$pkgdir"/usr/lib/spigot/spigot-$pkgver.jar
|
||||
}
|
||||
|
||||
sha512sums="f4898dff44e77495453aafd597c311989fbe812721e82ee52be2b6856b91f933f5b3ec75137b90923231dc2f9f68b84efca507fde4b9a22368f2ea9324323cb8 spigot-BuildTools-124.jar
|
||||
sha512sums="92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a spigot-BuildTools-126.jar
|
||||
d9ae3a5c28ba56d5e90ad3bee0fa8745aba85de0849d86b2d5cbd371e5386733e65b535147559e026d847af64b09c04da6d120f18a09d581281422754b3a1f8d spigot.initd"
|
|
@ -1,7 +1,7 @@
|
|||
# Contributor: Leo <thinkabit.ukim@gmail.com>
|
||||
# Maintainer:
|
||||
pkgname=telegram-desktop
|
||||
pkgver=2.5.1
|
||||
pkgver=2.6.1
|
||||
pkgrel=0
|
||||
pkgdesc="Telegram Desktop messaging app"
|
||||
options="!check" # Requires Catch2 to be packaged.
|
||||
|
@ -34,9 +34,9 @@ makedepends="
|
|||
qtchooser
|
||||
qt5-qtbase-dev
|
||||
qt5-qtsvg-dev
|
||||
qt5-qtlottie-dev
|
||||
range-v3-dev
|
||||
tl-expected
|
||||
tg_owt-dev
|
||||
xcb-util-keysyms-dev
|
||||
xxhash-dev
|
||||
xz-dev
|
||||
|
@ -47,8 +47,7 @@ source="
|
|||
https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
|
||||
remove-glibc.patch
|
||||
small-sizes.patch
|
||||
link-webrtc-to-libjpeg.patch
|
||||
fix-tgcalls.patch
|
||||
remove-calls.patch
|
||||
"
|
||||
builddir="$srcdir/tdesktop-$pkgver-full"
|
||||
|
||||
|
@ -66,14 +65,12 @@ build() {
|
|||
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
|
||||
-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \
|
||||
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \
|
||||
-DDESKTOP_APP_DISABLE_GTK_INTEGRATION=ON \
|
||||
-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
|
||||
-DDESKTOP_APP_USE_PACKAGED=ON \
|
||||
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
|
||||
-DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
|
||||
-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
|
||||
-DDESKTOP_APP_SPECIAL_TARGET="" \
|
||||
-DTDESKTOP_LAUNCHER_BASENAME=telegram-desktop \
|
||||
-DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \
|
||||
$CMAKE_CROSSOPTS .
|
||||
make -C build
|
||||
}
|
||||
|
@ -82,8 +79,7 @@ package() {
|
|||
DESTDIR="$pkgdir" make -C build install
|
||||
}
|
||||
|
||||
sha512sums="c906c76e44f5c6926bdc00143cbb1ac718633395a390c8a3e40fde9c4bfa42ba2e92cf0ac4c20434168d0548981f2fddefd019b942411ff4552a0f441336c0e1 tdesktop-2.5.1-full.tar.gz
|
||||
sha512sums="92506477ee1778f7528d8b914406cbf04abf1941d4f1a5d61b75dbf393df2184da1f4f83bbc343e221a539c7a01d3e3b3fe5286453d2bf1863b75ea922b70d5a tdesktop-2.6.1-full.tar.gz
|
||||
b276001d1616cb5dbacbcd18510d0bd4b9d9f7b7a895b05fb6329866f5bdb7b69f536f7d7914436c8ea975c4f7951a2bb3efd9209c38df115b1d85e0ed099b04 remove-glibc.patch
|
||||
3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch
|
||||
ff6afe7a7de018a92abc6bd1004eada82f81d1daec25a5816d969773b44b2f0b94bef4351c50200d94d18fda24b4aa1396ae3513a9b6d467d5e8900fc44c8e23 link-webrtc-to-libjpeg.patch
|
||||
cec87f2277ea552df71b80521b07cc469a410584a226ee56bd7e99bce230c85abc2cd12c7ee53f541b815cac1f766e310893248283c38be2a7a1f206be45691c fix-tgcalls.patch"
|
||||
11c57af7d3e9651ea76019c4cd8c6416c792fd5288ffd4e2d9357c81256a95c0e1b0a8c9fdad2d062a143f8d251695024693cbc1c8dcd0387d6858b706fda217 remove-calls.patch"
|
|
@ -0,0 +1,28 @@
|
|||
--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceImpl.cpp
|
||||
+++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceImpl.cpp
|
||||
@@ -569,7 +569,7 @@
|
||||
virtual void OnInterestingUsage(int usage_pattern) override {
|
||||
}
|
||||
|
||||
- virtual void OnErrorDemuxingPacket(uint32_t ssrc) override {
|
||||
+ virtual void OnErrorDemuxingPacket(uint32_t ssrc) {
|
||||
_onMissingSsrc(ssrc);
|
||||
}
|
||||
};
|
||||
@@ -1207,16 +1207,6 @@
|
||||
apm->ApplyConfig(audioConfig);
|
||||
|
||||
mediaDeps.audio_processing = apm;
|
||||
-
|
||||
- mediaDeps.onUnknownAudioSsrc = [weak](uint32_t ssrc) {
|
||||
- getMediaThread()->PostTask(RTC_FROM_HERE, [weak, ssrc](){
|
||||
- auto strong = weak.lock();
|
||||
- if (!strong) {
|
||||
- return;
|
||||
- }
|
||||
- strong->onMissingSsrc(ssrc);
|
||||
- });
|
||||
- };
|
||||
|
||||
dependencies.media_engine = cricket::CreateMediaEngine(std::move(mediaDeps));
|
||||
dependencies.call_factory = webrtc::CreateCallFactory();
|
|
@ -0,0 +1,11 @@
|
|||
--- a/cmake/external/webrtc/CMakeLists.txt
|
||||
+++ b/cmake/external/webrtc/CMakeLists.txt
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
find_package(tg_owt REQUIRED)
|
||||
- target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
|
||||
+ target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt INTERFACE jpeg)
|
||||
else()
|
||||
set(webrtc_loc ${libs_loc}/tg_owt/src)
|
||||
set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
|
|
@ -0,0 +1,150 @@
|
|||
--- a/Telegram/CMakeLists.txt
|
||||
+++ b/Telegram/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@ endif()
|
||||
add_subdirectory(lib_storage)
|
||||
add_subdirectory(lib_lottie)
|
||||
add_subdirectory(lib_qr)
|
||||
-add_subdirectory(lib_webrtc)
|
||||
+#add_subdirectory(lib_webrtc)
|
||||
add_subdirectory(codegen)
|
||||
|
||||
get_filename_component(src_loc SourceFiles REALPATH)
|
||||
@@ -26,8 +26,8 @@ get_filename_component(res_loc Resources REALPATH)
|
||||
|
||||
include(cmake/telegram_options.cmake)
|
||||
include(cmake/lib_ffmpeg.cmake)
|
||||
-include(cmake/lib_tgvoip.cmake)
|
||||
-include(cmake/lib_tgcalls.cmake)
|
||||
+#include(cmake/lib_tgvoip.cmake)
|
||||
+#include(cmake/lib_tgcalls.cmake)
|
||||
include(cmake/td_export.cmake)
|
||||
include(cmake/td_mtproto.cmake)
|
||||
include(cmake/td_lang.cmake)
|
||||
@@ -39,15 +39,15 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
|
||||
|
||||
target_link_libraries(Telegram
|
||||
PRIVATE
|
||||
- tdesktop::lib_tgcalls_legacy
|
||||
- tdesktop::lib_tgcalls
|
||||
- tdesktop::lib_tgvoip
|
||||
+# tdesktop::lib_tgcalls_legacy
|
||||
+# tdesktop::lib_tgcalls
|
||||
+# tdesktop::lib_tgvoip
|
||||
tdesktop::td_export
|
||||
tdesktop::td_mtproto
|
||||
tdesktop::td_lang
|
||||
tdesktop::td_scheme
|
||||
tdesktop::td_ui
|
||||
- desktop-app::lib_webrtc
|
||||
+# desktop-app::lib_webrtc
|
||||
desktop-app::lib_base
|
||||
desktop-app::lib_crl
|
||||
desktop-app::lib_ui
|
||||
@@ -258,35 +258,35 @@ PRIVATE
|
||||
boxes/url_auth_box.h
|
||||
boxes/username_box.cpp
|
||||
boxes/username_box.h
|
||||
- calls/calls_box_controller.cpp
|
||||
- calls/calls_box_controller.h
|
||||
- calls/calls_call.cpp
|
||||
- calls/calls_call.h
|
||||
- calls/calls_group_call.cpp
|
||||
- calls/calls_group_call.h
|
||||
- calls/calls_group_common.h
|
||||
- calls/calls_group_members.cpp
|
||||
- calls/calls_group_members.h
|
||||
- calls/calls_group_panel.cpp
|
||||
- calls/calls_group_panel.h
|
||||
- calls/calls_group_settings.cpp
|
||||
- calls/calls_group_settings.h
|
||||
- calls/calls_emoji_fingerprint.cpp
|
||||
- calls/calls_emoji_fingerprint.h
|
||||
- calls/calls_instance.cpp
|
||||
- calls/calls_instance.h
|
||||
- calls/calls_panel.cpp
|
||||
- calls/calls_panel.h
|
||||
- calls/calls_signal_bars.cpp
|
||||
- calls/calls_signal_bars.h
|
||||
- calls/calls_top_bar.cpp
|
||||
- calls/calls_top_bar.h
|
||||
- calls/calls_userpic.cpp
|
||||
- calls/calls_userpic.h
|
||||
- calls/calls_video_bubble.cpp
|
||||
- calls/calls_video_bubble.h
|
||||
- calls/calls_volume_item.cpp
|
||||
- calls/calls_volume_item.h
|
||||
+# calls/calls_box_controller.cpp
|
||||
+# calls/calls_box_controller.h
|
||||
+# calls/calls_call.cpp
|
||||
+# calls/calls_call.h
|
||||
+# calls/calls_group_call.cpp
|
||||
+# calls/calls_group_call.h
|
||||
+# calls/calls_group_common.h
|
||||
+# calls/calls_group_members.cpp
|
||||
+# calls/calls_group_members.h
|
||||
+# calls/calls_group_panel.cpp
|
||||
+# calls/calls_group_panel.h
|
||||
+# calls/calls_group_settings.cpp
|
||||
+# calls/calls_group_settings.h
|
||||
+# calls/calls_emoji_fingerprint.cpp
|
||||
+# calls/calls_emoji_fingerprint.h
|
||||
+# calls/calls_instance.cpp
|
||||
+# calls/calls_instance.h
|
||||
+# calls/calls_panel.cpp
|
||||
+# calls/calls_panel.h
|
||||
+# calls/calls_signal_bars.cpp
|
||||
+# calls/calls_signal_bars.h
|
||||
+# calls/calls_top_bar.cpp
|
||||
+# calls/calls_top_bar.h
|
||||
+# calls/calls_userpic.cpp
|
||||
+# calls/calls_userpic.h
|
||||
+# calls/calls_video_bubble.cpp
|
||||
+# calls/calls_video_bubble.h
|
||||
+# calls/calls_volume_item.cpp
|
||||
+# calls/calls_volume_item.h
|
||||
chat_helpers/bot_keyboard.cpp
|
||||
chat_helpers/bot_keyboard.h
|
||||
chat_helpers/emoji_keywords.cpp
|
||||
@@ -922,8 +922,8 @@ PRIVATE
|
||||
settings/settings_advanced.h
|
||||
settings/settings_chat.cpp
|
||||
settings/settings_chat.h
|
||||
- settings/settings_calls.cpp
|
||||
- settings/settings_calls.h
|
||||
+# settings/settings_calls.cpp
|
||||
+# settings/settings_calls.h
|
||||
settings/settings_codes.cpp
|
||||
settings/settings_codes.h
|
||||
settings/settings_common.cpp
|
||||
--- a/cmake/external/CMakeLists.txt
|
||||
+++ b/cmake/external/CMakeLists.txt
|
||||
@@ -63,7 +63,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
|
||||
endif()
|
||||
add_checked_subdirectory(ton)
|
||||
add_checked_subdirectory(variant)
|
||||
-add_checked_subdirectory(webrtc)
|
||||
+#add_checked_subdirectory(webrtc)
|
||||
if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
|
||||
add_checked_subdirectory(xcb)
|
||||
endif()
|
||||
--- a/Telegram/SourceFiles/core/core_settings.cpp
|
||||
+++ b/Telegram/SourceFiles/core/core_settings.cpp
|
||||
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "window/themes/window_theme.h"
|
||||
#include "window/section_widget.h"
|
||||
#include "base/platform/base_platform_info.h"
|
||||
-#include "webrtc/webrtc_create_adm.h"
|
||||
#include "facades.h"
|
||||
|
||||
namespace Core {
|
||||
@@ -497,10 +496,6 @@ void Settings::setTabbedReplacedWithInfo(bool enabled) {
|
||||
}
|
||||
}
|
||||
|
||||
-Webrtc::Backend Settings::callAudioBackend() const {
|
||||
- return Webrtc::Backend::OpenAL;
|
||||
-}
|
||||
-
|
||||
void Settings::setDialogsWidthRatio(float64 ratio) {
|
||||
_dialogsWidthRatio = ratio;
|
||||
}
|
|
@ -1,36 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=uirc
|
||||
pkgver=2021.01.04
|
||||
pkgrel=0
|
||||
pkgdesc="Simple and lightweight IRC protocol helper"
|
||||
url="https://git.redxen.eu/caskd/uIRC"
|
||||
arch="all"
|
||||
license="GPL-3.0-only"
|
||||
makedepends="cmake"
|
||||
subpackages="$pkgname-dev"
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://git.redxen.eu/caskd/uIRC/archive/$pkgver.tar.gz
|
||||
"
|
||||
builddir="$srcdir/uirc"
|
||||
|
||||
build() {
|
||||
cmake -B build \
|
||||
-DBUILD_SHARED_LIBS=True \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DBUILD_TESTS=ON \
|
||||
${CMAKE_CROSSOPTS} .
|
||||
make -C build
|
||||
}
|
||||
|
||||
check() {
|
||||
make -C build test
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" make -C build install
|
||||
}
|
||||
|
||||
sha512sums="225d0bd963c722be4e73bfc12069e0387ef1828f3cdeb971dc34e3519028eaac5e0f01e40e869572cda338cbb591f4700a8982631a60b6a1873ba7ec59973952 uirc-2021.01.04.tar.gz"
|
|
@ -1,36 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=uircd
|
||||
pkgver=2021.01.09
|
||||
pkgrel=2
|
||||
pkgdesc="High performance IRC bouncer based on uIRC"
|
||||
url="https://git.redxen.eu/caskd/uIRCd"
|
||||
arch="all"
|
||||
license="GPL-3.0-only"
|
||||
makedepends="uirc-dev libconfig-dev cmake"
|
||||
subpackages="$pkgname-openrc"
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://git.redxen.eu/caskd/uIRCd/archive/$pkgver.tar.gz
|
||||
uircd.initd
|
||||
0001-test.patch
|
||||
"
|
||||
builddir="$srcdir/uircd"
|
||||
options="!check" # No test suite
|
||||
|
||||
build() {
|
||||
# CODE_ANAYZER is off until warning is fixed
|
||||
cmake -B build \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
${CMAKE_CROSSOPTS} .
|
||||
make -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" make -C build install
|
||||
install -Dm755 "$srcdir"/uircd.initd "$pkgdir"/etc/init.d/uircd
|
||||
}
|
||||
|
||||
sha512sums="1d44ee30565be0bb80a024d7696a459c2eebc2f9058275520c48c49b8b07fddaa99a20ec956e6906b2ebe35de0ae235cc46693b06fe9b45407b800b1c63a34c6 uircd-2021.01.09.tar.gz
|
||||
c6b02b9f324797ff49669624ea8a4db74f4469f3661b3f55ccce98b0b84fed4d6de45dd4954127ad7b8740dbdbba93e2ee3817c43ad327b8518240e37e5c82ed uircd.initd
|
||||
755c8a314aa78faa7d70988049ec8b2136f6fdfa33a995cdcaf4ad661fe537f9995d5c1c45d7b60c451cfc38b8c59c2e2dddf1f623fdbf742499697600b99575 0001-test.patch"
|
|
@ -1,13 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
|
||||
description="microIRC daemon"
|
||||
supervisor=supervise-daemon
|
||||
command="/usr/bin/uircd"
|
||||
command_args="${UIRCD_ARGS:--C $uircd_config}"
|
||||
pidfile="/run/${RC_SVCNAME}.pid"
|
||||
command_background=true
|
||||
|
||||
depend() {
|
||||
want stunnel.irc
|
||||
after stunnel.irc firewall
|
||||
}
|
|
@ -0,0 +1,23 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
_game=mineclone2
|
||||
pkgname="minetest-$_game"
|
||||
pkgver=0.71.0
|
||||
pkgrel=0
|
||||
pkgdesc="Voxel-based sandbox game for Minetest"
|
||||
url="https://git.minetest.land/MineClone2/MineClone2"
|
||||
arch="noarch"
|
||||
license="GPL-3.0-or-later"
|
||||
depends="minetest-common"
|
||||
source="
|
||||
$pkgname-$pkgver.tar.gz::https://git.minetest.land/MineClone2/MineClone2/archive/$pkgver.tar.gz
|
||||
"
|
||||
options="!check"
|
||||
builddir="$srcdir"
|
||||
|
||||
package() {
|
||||
mkdir -p "$pkgdir/usr/share/minetest/games"
|
||||
mv "$_game" "$pkgdir/usr/share/minetest/games/$_game"
|
||||
}
|
||||
|
||||
sha512sums="7a602fefa151a975ee1fa0f18db6ef46955e4fb9ef763748620ba3779b83656eb2bfa7851d5454cf843d00a464f6b494a21dd66d7c7a1a3af441d87bf14aefd5 minetest-mineclone2-0.71.0.tar.gz"
|
|
@ -1,39 +0,0 @@
|
|||
# Contributor: Gaber Ayoubi <gaber.ayoubi@gmail.com>
|
||||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=dwm-mobile
|
||||
pkgver=6.2
|
||||
pkgrel=0
|
||||
provides="dwm"
|
||||
_commit="b2dff3f769efb7947350e0b7f93bf3eef202044d"
|
||||
pkgdesc="dwm - dynamic window manager (with caskd's patches)"
|
||||
url="https://dwm.suckless.org"
|
||||
arch="all"
|
||||
options="!check"
|
||||
license="MIT/X"
|
||||
depends="dmenu st misc-scripts imagemagick pulsemixer nnn xdg-utils"
|
||||
makedepends="libxft-dev libx11-dev libxinerama-dev"
|
||||
subpackages="$pkgname-doc"
|
||||
source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/caskd/dwm/archive/$_commit.tar.gz"
|
||||
builddir="$srcdir/dwm"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
|
||||
-e '/LDFLAGS/{s/=/+=/}' \
|
||||
"$builddir"/config.mk
|
||||
}
|
||||
|
||||
build() {
|
||||
make X11INC=/usr/include/X11 \
|
||||
X11LIB=/usr/lib/X11 \
|
||||
FREETYPEINC=/usr/include/freetype2 \
|
||||
-C "$builddir"
|
||||
}
|
||||
|
||||
package() {
|
||||
make PREFIX=/usr DESTDIR="$pkgdir" \
|
||||
-C "$builddir" install
|
||||
}
|
||||
|
||||
sha512sums="dfedd0f0e36acb6d4a1e492d1938ccb3af936331f874fb346cd8dc8bc9360c3928b720542303e0e5c093a1576100934eaf5d922af5903e1afce295a57c07c7b3 dwm-mobile-6.2-b2dff3f769efb7947350e0b7f93bf3eef202044d.tar.gz"
|
|
@ -1,26 +0,0 @@
|
|||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=svkbd-patched
|
||||
pkgver=0.2.1
|
||||
pkgrel=0
|
||||
provides="svkbd"
|
||||
_commit="a8ea266a79cb2414f06598205db8b229c474ac8f"
|
||||
pkgdesc="Simple virtual keyboard for X, ships with an international mobile-optimised layout"
|
||||
url="https://tools.suckless.org/x/svkbd/"
|
||||
arch="all"
|
||||
license="MIT"
|
||||
subpackages="$pkgname-doc"
|
||||
options="!check" # has no tests
|
||||
makedepends="fontconfig-dev freetype-dev libx11-dev libxtst-dev libxft-dev libxinerama-dev"
|
||||
source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/pinephone-mods/svkbd/archive/$_commit.tar.gz"
|
||||
builddir="$srcdir/svkbd"
|
||||
|
||||
build() {
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
make PREFIX=/usr DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
sha512sums="e70d57d2a4a87de1482c6cc3e5dbe903ed3f00d8095f5dfb77f38736a89cf84b972a0dba1039a9f4663a55c071da8e4f904ea48964745ec8c49c57656c84eb90 svkbd-patched-0.2.1-a8ea266a79cb2414f06598205db8b229c474ac8f.tar.gz"
|
|
@ -0,0 +1,446 @@
|
|||
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
|
||||
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
|
||||
# Contributor: Alex Denes <caskd@redxen.eu>
|
||||
# Maintainer: Alex Denes <caskd@redxen.eu>
|
||||
pkgname=ungoogled-chromium
|
||||
pkgver=87.0.4280.88
|
||||
pkgrel=0
|
||||
_patchrel=1
|
||||
pkgdesc="Chromium web browser with ungoogled-chromium patches"
|
||||
url="https://github.com/Eloston/ungoogled-chromium"
|
||||
arch="x86_64 aarch64" # x86: ./v8_context_snapshot_generator segfaults
|
||||
# armv7: /usr/bin/ld: final link failed: memory exhausted when linking chrome
|
||||
license="BSD-3-Clause"
|
||||
depends="xdg-utils"
|
||||
makedepends="
|
||||
alsa-lib-dev
|
||||
pulseaudio-dev
|
||||
bash
|
||||
binutils-gold
|
||||
bison flex
|
||||
bsd-compat-headers
|
||||
bzip2-dev
|
||||
cairo-dev
|
||||
clang-dev
|
||||
cups-dev
|
||||
dbus-glib-dev
|
||||
elfutils-dev
|
||||
eudev-dev
|
||||
ffmpeg-dev
|
||||
findutils
|
||||
flac-dev
|
||||
freetype-dev
|
||||
gnutls-dev
|
||||
gperf
|
||||
gtk+3.0-dev
|
||||
gzip
|
||||
harfbuzz-dev
|
||||
hunspell-dev
|
||||
hwids-usb
|
||||
jpeg-dev
|
||||
jsoncpp-dev
|
||||
krb5-dev
|
||||
libbsd-dev
|
||||
libcap-dev
|
||||
libevent-dev
|
||||
libexif-dev
|
||||
libgcrypt-dev
|
||||
libgnome-keyring-dev
|
||||
libjpeg-turbo-dev
|
||||
libpng-dev
|
||||
libusb-dev
|
||||
libva-dev
|
||||
libwebp-dev
|
||||
libxcomposite-dev
|
||||
libxcursor-dev
|
||||
libxinerama-dev
|
||||
libxml2-dev
|
||||
libxrandr-dev
|
||||
libxscrnsaver-dev
|
||||
libxslt-dev
|
||||
linux-headers
|
||||
mesa-dev
|
||||
minizip-dev
|
||||
ninja
|
||||
nodejs
|
||||
nss-dev
|
||||
openjdk8
|
||||
opus-dev
|
||||
pciutils-dev
|
||||
perl
|
||||
python2
|
||||
re2-dev
|
||||
snappy-dev
|
||||
speex-dev
|
||||
sqlite-dev
|
||||
xcb-proto
|
||||
xdg-utils
|
||||
zlib-dev
|
||||
py2-setuptools
|
||||
"
|
||||
# explicit depends for --headless
|
||||
depends="eudev-libs ttf-opensans"
|
||||
options="suid"
|
||||
subpackages="$pkgname-chromedriver"
|
||||
builddir="$srcdir"/"chromium-$pkgver"
|
||||
source="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
|
||||
https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-$_patchrel.tar.gz
|
||||
pstables-2.8.h::https://git.savannah.gnu.org/cgit/freetype/freetype2.git/plain/src/psnames/pstables.h?h=VER-2-8
|
||||
chromium-launcher.sh
|
||||
chromium.conf
|
||||
chromium.desktop
|
||||
google-api.keys
|
||||
|
||||
default-pthread-stacksize.patch
|
||||
musl-fixes.patch
|
||||
musl-fixes-breakpad.patch
|
||||
musl-hacks.patch
|
||||
musl-libc++.patch
|
||||
musl-sandbox.patch
|
||||
no-execinfo.patch
|
||||
no-mallinfo.patch
|
||||
resolver.patch
|
||||
swiftshader.patch
|
||||
create-extra-view-redefinition.patch
|
||||
|
||||
chromium-use-alpine-target.patch
|
||||
media-base.patch
|
||||
musl-crashpad.patch
|
||||
musl-v8-monotonic-pthread-cont_timedwait.patch
|
||||
nasm.patch
|
||||
|
||||
gcc-fno-delete-null-pointer-checks.patch
|
||||
gcc-arm.patch
|
||||
aarch64-fixes.patch
|
||||
elf-arm.patch
|
||||
|
||||
chromium-size_t-defined.patch
|
||||
check-for-enable-accelerated-video-decode-on-Linux.patch
|
||||
fix-invalid-end-iterator-usage-in-CookieMonster.patch
|
||||
only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
|
||||
xproto-fix-underflow-in-Fp1616ToDouble.patch
|
||||
|
||||
ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch
|
||||
ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch
|
||||
ungoogled-chromium-patches/core/debian/disable/unrar.patch
|
||||
|
||||
ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch
|
||||
ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch
|
||||
|
||||
ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
|
||||
ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
|
||||
ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch
|
||||
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-gaia.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-gcm.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-google-host-detection.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-mei-preload.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-network-time-tracker.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-signin.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-untraceable-urls.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/disable-webstore-urls.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
|
||||
ungoogled-chromium-patches/core/ungoogled-chromium/use-local-devtools-files.patch
|
||||
|
||||
ungoogled-chromium-patches/extra/debian/disable/android.patch
|
||||
ungoogled-chromium-patches/extra/debian/disable/device-notifications.patch
|
||||
ungoogled-chromium-patches/extra/debian/disable/fuzzers.patch
|
||||
ungoogled-chromium-patches/extra/debian/disable/google-api-warning.patch
|
||||
ungoogled-chromium-patches/extra/debian/disable/welcome-page.patch
|
||||
ungoogled-chromium-patches/extra/debian/fixes/connection-message.patch
|
||||
ungoogled-chromium-patches/extra/debian/gn/parallel.patch
|
||||
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0006-modify-default-prefs.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0008-restore-classic-ntp.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0013-disable-missing-key-warning.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
|
||||
ungoogled-chromium-patches/extra/inox-patchset/0019-disable-battery-status-service.patch
|
||||
|
||||
ungoogled-chromium-patches/extra/iridium-browser/Remove-EV-certificates.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
|
||||
ungoogled-chromium-patches/extra/iridium-browser/updater-disable-auto-update.patch
|
||||
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-components-ungoogled.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/disable-download-quarantine.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/popups-to-tabs.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
|
||||
ungoogled-chromium-patches/extra/ungoogled-chromium/searx.patch
|
||||
|
||||
ungoogled-chromium-patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
|
||||
ungoogled-chromium-patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
|
||||
ungoogled-chromium-patches/extra/bromite/flag-max-connections-per-host.patch
|
||||
|
||||
ungoogled-chromium-patches/0001-fix-var-undefined.patch
|
||||
ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch
|
||||
"
|
||||
|
||||
# secfixes:
|
||||
# 83.0.4103.116-r0:
|
||||
# - CVE-2020-6505
|
||||
# - CVE-2020-6506
|
||||
# - CVE-2020-6507
|
||||
# - CVE-2020-6509
|
||||
# 72.0.3626.121-r0:
|
||||
# - CVE-2019-5786
|
||||
|
||||
if [ -n "$DEBUG" ]; then
|
||||
_buildtype=Debug
|
||||
_is_debug=true
|
||||
else
|
||||
_buildtype=Release
|
||||
_is_debug=false
|
||||
fi
|
||||
|
||||
prepare() {
|
||||
patch_args="-p0"
|
||||
default_prepare
|
||||
msg "Pruning binaries"
|
||||
"$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/utils/prune_binaries.py ./ "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/pruning.list
|
||||
msg "Apply domain substitution"
|
||||
"$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/utils/domain_substitution.py apply -r "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/domain_regex.list -f "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/domain_substitution.list -c domainsubcache.tar.gz ./
|
||||
|
||||
# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
|
||||
touch chrome/test/data/webui/i18n_process_css_test.html
|
||||
# Use the file at run time instead of effectively compiling it in
|
||||
sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
|
||||
-i services/device/public/cpp/usb/BUILD.gn
|
||||
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
||||
# reusable system library settings
|
||||
local use_system="
|
||||
ffmpeg
|
||||
flac
|
||||
fontconfig
|
||||
freetype
|
||||
harfbuzz-ng
|
||||
libdrm
|
||||
libevent
|
||||
libjpeg
|
||||
libpng
|
||||
libwebp
|
||||
libxml
|
||||
libxslt
|
||||
opus
|
||||
re2
|
||||
snappy
|
||||
"
|
||||
for _lib in $use_system libjpeg_turbo; do
|
||||
msg "Removing buildscripts for system provided $_lib"
|
||||
find -type f -path "*third_party/$_lib/*" \
|
||||
\! -path "*third_party/$_lib/chromium/*" \
|
||||
\! -path "*third_party/$_lib/google/*" \
|
||||
\! -path './base/third_party/icu/*' \
|
||||
\! -path './third_party/libxml/*' \
|
||||
\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
|
||||
\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
|
||||
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||
-delete
|
||||
done
|
||||
|
||||
msg "Replacing gn files"
|
||||
python2 build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
$use_system
|
||||
third_party/libaddressinput/chromium/tools/update-strings.py
|
||||
|
||||
}
|
||||
|
||||
_gn_flags() {
|
||||
echo $*
|
||||
}
|
||||
|
||||
build() {
|
||||
##############################################################
|
||||
# Please dont use these keys outside of Alpine Linux project #
|
||||
# You can create your own at: #
|
||||
# http://www.chromium.org/developers/how-tos/api-keys #
|
||||
##############################################################
|
||||
msg "Bootstrapping GN"
|
||||
local _c=$(_gn_flags is_clang=true \
|
||||
use_sysroot=false \
|
||||
treat_warnings_as_errors=false \
|
||||
fatal_linker_warnings=false \
|
||||
use_custom_libcxx=false \
|
||||
use_gold=false \
|
||||
use_allocator=\"none\" \
|
||||
use_allocator_shim=false \
|
||||
use_vaapi=true \
|
||||
)
|
||||
|
||||
# AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \
|
||||
CC="${CC:-clang}" CXX="${CXX:-clang++}" LD="${CXX:-clang++}" \
|
||||
python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c"
|
||||
|
||||
msg "Configuring build"
|
||||
_c=$(_gn_flags \
|
||||
blink_symbol_level=0 \
|
||||
clang_use_chrome_plugins=false \
|
||||
enable_js_type_check=false \
|
||||
custom_toolchain=\"//build/toolchain/linux/unbundle:default\" \
|
||||
enable_nacl_nonsfi=false \
|
||||
enable_nacl=false \
|
||||
enable_precompiled_headers=false \
|
||||
fatal_linker_warnings=false \
|
||||
ffmpeg_branding=\"Chrome\" \
|
||||
fieldtrial_testing_like_official_build=true \
|
||||
gold_path=\"/usr/bin/ld.gold\" \
|
||||
host_toolchain=\"//build/toolchain/linux/unbundle:default\" \
|
||||
icu_use_data_file=true \
|
||||
is_clang=true \
|
||||
is_component_build=false \
|
||||
is_debug=$_is_debug \
|
||||
is_desktop_linux=true \
|
||||
safe_browsing_mode=0 \
|
||||
enable_one_click_signin=false \
|
||||
enable_reading_list=false \
|
||||
enable_remoting=false \
|
||||
enable_reporting=false \
|
||||
use_official_google_api_keys=false \
|
||||
proprietary_codecs=true \
|
||||
symbol_level=0 \
|
||||
treat_warnings_as_errors=false \
|
||||
use_allocator_shim=false \
|
||||
use_allocator=\"none\" \
|
||||
use_cups=true \
|
||||
use_custom_libcxx=false \
|
||||
use_gnome_keyring=false \
|
||||
use_gold=false \
|
||||
use_lld=false \
|
||||
use_pulseaudio=true \
|
||||
use_sysroot=false \
|
||||
use_system_harfbuzz=true \
|
||||
)
|
||||
|
||||
AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \
|
||||
out/Release/gn gen out/$_buildtype --args="$_c $_ca"
|
||||
|
||||
# Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2
|
||||
ln -sf /usr/lib/python3.*/site-packages/xcbgen .
|
||||
export PYTHONPATH="$PWD"
|
||||
|
||||
msg "Ninja turtles GO!"
|
||||
|
||||
# build mksnapshot
|
||||
ninja -j ${JOBS} -C out/$_buildtype mksnapshot
|
||||
ninja -j ${JOBS} -C out/$_buildtype v8_context_snapshot_generator
|
||||
|
||||
if [ "$CARCH" = "x86" ]; then
|
||||
# x86 only - dependency issues compiling obj/chrome/browser/devtools/devtools/cast_handler.o
|
||||
ninja -j ${JOBS} -C out/$_buildtype obj/chrome/common/media_router/mojom/media_router__generator.stamp
|
||||
fi
|
||||
|
||||
# final link needs lots of file descriptors
|
||||
ulimit -n 2048
|
||||
|
||||
# finish rest of the build
|
||||
ninja -j ${JOBS} -C out/$_buildtype chrome chrome_sandbox chromedriver
|
||||
}
|
||||
|
||||
package() {
|
||||
cd out/$_buildtype
|
||||
local bin pak
|
||||
for bin in chrome chromedriver *.bin; do
|
||||
install -Dm755 $bin "$pkgdir"/usr/lib/$pkgname/$bin
|
||||
done
|
||||
|
||||
install -Dm755 swiftshader/libEGL.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libEGL.so
|
||||
install -Dm755 swiftshader/libGLESv2.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libGLESv2.so
|
||||
|
||||
install -Dm4755 chrome_sandbox "$pkgdir"/usr/lib/$pkgname/chrome-sandbox
|
||||
install -m644 icudtl.dat "$pkgdir"/usr/lib/$pkgname/icudtl.dat
|
||||
|
||||
install -Dm755 xdg-mime "$pkgdir"/usr/lib/$pkgname/xdg-mime
|
||||
install -Dm755 xdg-settings "$pkgdir"/usr/lib/$pkgname/xdg-settings
|
||||
|
||||
for pak in *.pak; do
|
||||
install -Dm644 $pak "$pkgdir"/usr/lib/$pkgname/$pak
|
||||
done
|
||||
|
||||
install -Dm755 "$srcdir"/chromium-launcher.sh \
|
||||
"$pkgdir"/usr/lib/$pkgname/chromium-launcher.sh
|
||||
|
||||
cp -a locales "$pkgdir"/usr/lib/$pkgname/
|
||||
|
||||
# It is important that we name the target "chromium-browser",
|
||||
# xdg-utils expect it; bug #355517.
|
||||
mkdir -p "$pkgdir"/usr/bin
|
||||
cd "$pkgdir"/usr/bin
|
||||
ln -sf /usr/lib/$pkgname/chromium-launcher.sh chromium-browser
|
||||
ln -sf /usr/lib/$pkgname/chromedriver "$pkgdir"/usr/bin/
|
||||
|
||||
install -Dm644 "$srcdir"/chromium.conf \
|
||||
"$pkgdir"/etc/chromium/chromium.conf
|
||||
|
||||
install -Dm644 "$srcdir"/chromium.desktop \
|
||||
"$pkgdir"/usr/share/applications/chromium.desktop
|
||||
|
||||
cd "$builddir"
|
||||
for size in 24 48 64 128 256; do
|
||||
install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
|
||||
"$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png"
|
||||
done
|
||||
|
||||
for size in 16 32; do
|
||||
install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
|
||||
"$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png"
|
||||
done
|
||||
}
|
||||
|
||||
chromedriver() {
|
||||
pkgdesc="WebDriver driver for the Chromium Browser"
|
||||
mkdir -p "$subpkgdir"/usr/lib/$pkgname "$subpkgdir"/usr/bin
|
||||
mv "$pkgdir"/usr/lib/$pkgname/chromedriver \
|
||||
"$subpkgdir"/usr/lib/$pkgname/
|
||||
mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue