Azahar-Mirror/build-environment
1
0
Fork 0
mirror of https://github.com/azahar-emu/build-environment synced 2025-11-07 07:30:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add libavcodec-dev, libavformat-dev and libswscale-dev

Browse Source 
The install_package script is slightly changed to correctly handle the different version format (with a number followed by `:` in front of the version) and "or" dependencies (separated by `|` in dpkg info)
This commit is contained in:
zhupengfei 2018-12-30 20:45:47 +08:00
parent 055f5642ac
commit 0a34282a90
No known key found for this signature in database
GPG Key ID: DD129E108BD09378
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-flatpak/Dockerfile
View File

@ -2,6 +2,6 @@ FROM ubuntu:18.04
MAINTAINER citra MAINTAINER citra
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get -y full-upgrade RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2 RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavformat-dev libswscale-dev wget git ccache cmake flatpak flatpak-builder ca-certificates sshfs curl fuse dnsutils gnupg2
RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo RUN flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
RUN flatpak install -y flathub org.kde.Platform//5.11 org.kde.Sdk//5.11 org.freedesktop.Sdk.Extension.gcc7 RUN flatpak install -y flathub org.kde.Platform//5.11 org.kde.Sdk//5.11 org.freedesktop.Sdk.Extension.gcc7

2
linux-fresh/Dockerfile
View File

@ -2,4 +2,4 @@ FROM ubuntu:18.04
MAINTAINER citra MAINTAINER citra
RUN useradd -m -s /bin/bash citra RUN useradd -m -s /bin/bash citra
RUN apt-get update && apt-get -y full-upgrade RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools wget git ccache cmake RUN apt-get install -y p7zip-full build-essential libsdl2-dev qtbase5-dev libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools libavcodec-dev libavformat-dev libswscale-dev wget git ccache cmake

5
linux-frozen/Dockerfile
View File

@ -11,5 +11,8 @@ RUN cd /tmp/pkgs && python2 install_package.py \
qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \ qtdeclarative5-dev 5.9.3-0ubuntu1 bionic \
qtmultimedia5-dev 5.9.3-0ubuntu3 bionic \ qtmultimedia5-dev 5.9.3-0ubuntu3 bionic \
libicu57 57.1-6ubuntu0.2 bionic \ libicu57 57.1-6ubuntu0.2 bionic \
cmake 3.10.2-1ubuntu2 bionic cmake 3.10.2-1ubuntu2 bionic \
libavcodec-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \
libavformat-dev 7:3.4.4-0ubuntu0.18.04.1 bionic \
libswscale-dev 7:3.4.4-0ubuntu0.18.04.1 bionic
RUN rm -rf /tmp/pkgs RUN rm -rf /tmp/pkgs

4
linux-frozen/install_package.py
View File

@ -20,7 +20,7 @@ def get_url(pkg, distro):
build_ref = launchpad.archives.getByReference(reference='ubuntu').getPublishedBinaries( build_ref = launchpad.archives.getByReference(reference='ubuntu').getPublishedBinaries(
binary_name=pkg[0], distro_arch_series='https://api.launchpad.net/devel/ubuntu/' + distro + '/amd64', version=pkg[1], exact_match=True, order_by_date=True).entries[0] binary_name=pkg[0], distro_arch_series='https://api.launchpad.net/devel/ubuntu/' + distro + '/amd64', version=pkg[1], exact_match=True, order_by_date=True).entries[0]
build_link = build_ref['build_link'] build_link = build_ref['build_link']
deb_name = '{}_{}_{}.deb'.format(pkg[0], pkg[1], 'amd64' if build_ref['architecture_specific'] else 'all') deb_name = '{}_{}_{}.deb'.format(pkg[0], pkg[1].split(':', 1)[-1], 'amd64' if build_ref['architecture_specific'] else 'all')
deb_link = build_link + '/+files/' + deb_name deb_link = build_link + '/+files/' + deb_name
return [deb_link, deb_name] return [deb_link, deb_name]
@ -28,7 +28,7 @@ def get_url(pkg, distro):
def list_dependencies(deb_file): def list_dependencies(deb_file):
t = subprocess.check_output( t = subprocess.check_output(
['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\: \K.*$") || true'.format(deb_file)]) ['bash', '-c', '(dpkg -I {} | grep -oP "^ Depends\: \K.*$") || true'.format(deb_file)])
deps = [i.strip() for i in t.split(',')] deps = [i.split('|')[0].strip() for i in t.split(',')]
equals_re = re.compile(r'^(.*) \(= (.*)\)$') equals_re = re.compile(r'^(.*) \(= (.*)\)$')
return [equals_re.sub(r'\1=\2', i).split('=') for i in filter(equals_re.match, deps)] return [equals_re.sub(r'\1=\2', i).split('=') for i in filter(equals_re.match, deps)]