mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-16 02:23:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2020-10-02 14:35:15 +00:00
parent 0d1ce674a7 3f4da19611
commit 1a60fdac65
8 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-python/hstspreload/Manifest
View File

@@ -1 +1 @@
DIST hstspreload-2020.9.15.tar.gz 953227 BLAKE2B 9aa8af44f148f5978a520a71f927e8deb723e19ad90772cf6bb1009a2d3d7412b3b7ac38bd598ca0387b67b3aa96ef3086b63716b51f5e1344ae88132e58e980 SHA512 925ad2bb26852901e3ec7b37907389121b0328c44516e94ea776fb395542d2835406e656f3733438e8779adfe4ae4dfeb4db28990673a55b168df8f1afde8d84
DIST hstspreload-2020.9.29.tar.gz 958820 BLAKE2B f17ae4d1491f8a39da76e3d8a88a16dd4a94b63cfbc915e44ea61710c312a854138638305bbc953c295dd426d5b4fa17660f224828d1e7d9011e548a6d252238 SHA512 a15f9d1c99144730dee2486f54bf75f4e1eab199767a7af9e720b41dd31829be144b7156fb967d50e7a42319e6d69778f67cf76970bf9861d6764cbb5849f9d0

0
dev-python/hstspreload/hstspreload-2020.9.15.ebuild → dev-python/hstspreload/hstspreload-2020.9.29.ebuild
View File

3
games-action/minecraft-launcher/Manifest
View File

@@ -1,4 +1,5 @@
DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
DIST minecraft-launcher-2.1.17417.tar.gz 89726009 BLAKE2B 44f797f0d4780cab12ae09f5e656c190aa173948b2722a5a48b1901c238dc601a48f949d3a7212f1adb34fe850a859583fb32722e9c85d9c9628f7c3c0e36f86 SHA512 145d13ef4eb4f1b28fdc7de4b0183d32b7453dfd0bd192adb5dcae5863a5827dd480190f510fb98e856cd223836fbb1b455f86cc6944c568fa8669f4af58f393
DIST minecraft-launcher-2.1.17627.tar.gz 89727167 BLAKE2B 22d385b56c99713e7fb6e9c901c872fd6ec7fc507d3d2c0a645b5f4332837c0cf41f9eb6956a5ddcf0711bae263ecc820be6e085f5f11a035b6dccb50ca0d060 SHA512 3035dec9344520a9f5649db063875da83886da29b1db4479348a91ffcfb8abf089da92c3faa75d717cd978a31f73f36a1e752c072dbf03267b45c13e0b98b057
DIST minecraft-launcher-2.1.17785_beta.tar.gz 90369245 BLAKE2B bbfb104ec8a223416145745f579a6fafaf979619058bbcdede3070dfe805f51d22fbf4091d96fd6b8ffcc50541844408dda76c1d7d08ba779262d7471a20a675 SHA512 d3c34efce03f12e1d7e1566b7777a7c99b9e4aea36d95417aa18c91f8ee621012ef7216e6d69008bacab23ddc0a12d06ba9ca7461c29c4855ff95477a3a15941
DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a

0
games-action/minecraft-launcher/minecraft-launcher-2.1.17417.ebuild → games-action/minecraft-launcher/minecraft-launcher-2.1.17627.ebuild
View File

58
games-action/minecraft-launcher/minecraft-launcher-2.1.17785_beta.ebuild Normal file
View File

@@ -0,0 +1,58 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit desktop xdg
DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
HOMEPAGE="https://www.minecraft.net/"
SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV/_beta/}.tar.gz -> ${P}.tar.gz
https://launcher.mojang.com/download/minecraft-launcher.svg"
KEYWORDS="~amd64 ~x86"
LICENSE="Mojang"
SLOT="2"
RESTRICT="bindist mirror"
RDEPEND="
>=x11-libs/gtk+-2.24.32-r1[X]
dev-libs/nss
dev-libs/libbsd
dev-libs/libffi
dev-libs/libpcre
gnome-base/gconf
media-libs/alsa-lib
media-libs/openal
net-libs/gnutls[idn]
sys-apps/dbus
virtual/jre:1.8
virtual/opengl
x11-apps/xrandr
x11-libs/libXScrnSaver
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXrender
x11-libs/libXtst
x11-libs/xcb-util
"
S="${WORKDIR}/${PN}"
src_install() {
dodir /opt/${PN}
insinto /opt/${PN}/
doins -r .
fperms +x /opt/${PN}/${PN}
dosym ../${PN}/${PN} /opt/bin/${PN}
doicon -s scalable "${DISTDIR}/${PN}.svg"
make_desktop_entry ${PN} "Minecraft" ${PN} Game
}

2
media-tv/droidcam/Manifest
View File

@@ -1 +1 @@
DIST droidcam-1.4.tar.gz 84350 BLAKE2B 3d627f94aa9d04b3ce9785005b5a3d06895c74254001033c7d881bdc2359e3d34db5668e0df59a9f293014f7cd78e6f4aa07f25cd8a8ed3f54c1658a9406e7d8 SHA512 60ca2d15514a03a71e04e0f5e1382a5af4e7244329d4113e8af1dd0adb8a448febc60adf94bbcad8db8de0e0ffd906de1f2427488dc9e27ebe7739c7331ac99d
DIST droidcam-1.5.tar.gz 79700 BLAKE2B 05ec5eccec3f4fcec0457fad3b092ae3312c6de3c7cf9d574d002eaa06c92f1f93631c5dc36ed3465f4941a51b37f22b404815d88150604f5f02cf7593006340 SHA512 b441d1c69b77522d427b729439d4efa041a93b224e9fd7f7502260aac8a334a110152592670903cc4df8a194707f78a52a0c14cfcdd52a1e8ea7c391e6fd586c

3
media-tv/droidcam/droidcam-1.4-r1.ebuild → media-tv/droidcam/droidcam-1.5.ebuild
View File

@@ -22,11 +22,12 @@ RESTRICT="test"
DEPEND="
=app-pda/libusbmuxd-1*
dev-libs/glib
dev-libs/libappindicator:3
dev-util/android-tools
media-libs/alsa-lib
media-libs/libjpeg-turbo
>=media-libs/speex-1.2.0-r1
media-video/ffmpeg
dev-util/android-tools
gtk? (
dev-cpp/gtkmm:3.0
x11-libs/gdk-pixbuf

27
media-tv/droidcam/files/droidcam-makefile-fixes.patch
View File

@@ -1,44 +1,45 @@
diff --git a/Makefile b/Makefile
index 97a6e1f..6779293 100644
index 91ca3af..408de37 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Use at your own risk. See README file for more details.
-JPEG_DIR ?= /opt/libjpeg-turbo
+JPEG_DIR ?= /usr
JPEG_INCLUDE ?= $(JPEG_DIR)/include
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
@@ -15,14 +15,14 @@ CC = -std=c++11 -x c++ -Wall -fPIC -no-pie
GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
@@ -16,15 +16,15 @@ GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
GTK += `pkg-config --cflags --libs appindicator3-0.1`
LIBAV = `pkg-config --libs --cflags libswscale libavutil`
LIBS = -lspeex -lasound -lpthread -lm
-JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
+JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
USBMUXD = -lusbmuxd
all: droidcam-cli droidcam
ifeq "$(RELEASE)" "1"
-LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
-SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.a /usr/lib/x86_64-linux-gnu/libxml2.a src/libplist-2.0.a
+LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so
+SRC += /usr/lib/x86_64-linux-gnu/libusbmuxd.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
package: clean all
zip -x *.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
@@ -34,10 +34,10 @@ gresource: .gresource.xml icon2.png
zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png
glib-compile-resources .gresource.xml --generate-source --target=src/resources.c
droidcam-cli: src/droidcam-cli.c $(SRC)
- $(GXX) $(CC) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli
droidcam: src/droidcam.c src/resources.c $(SRC)
- $(GXX) $(CC) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam
clean:
rm droidcam || true