Merge ~lowlyocean/pcsx2-github-mirror:dev9_linux into ~helkaluin/pcsx2-github-mirror:master

Proposed by Daniel Nowak
Status: Superseded
Proposed branch: ~lowlyocean/pcsx2-github-mirror:dev9_linux
Merge into: ~helkaluin/pcsx2-github-mirror:master
Diff against target: 43 lines (+9/-1)
3 files modified
debian/control (+2/-0)
debian/create_built_tarball.sh (+1/-1)
debian/postinst (+6/-0)
Reviewer Review Type Date Requested Status
Jonathan Yip Pending
Review via email: mp+356678@code.launchpad.net

Commit message

Update for dev9ghzdrk on Linux

Description of the change

To post a comment you must log in.

Unmerged commits

b0c75ce... by Daniel Nowak

Update for dev9ghzdrk on Linux

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index fe7b67f..11ca2b2 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -14,11 +14,13 @@ Build-Depends: cmake (>= 2.8.5),
6 liblzma-dev,
7 libpng12-dev | libpng-dev,
8 libpulse-dev,
9+ libpcap0.8-dev,
10 libsdl2-dev,
11 libsoundtouch-dev,
12 libwxbase3.0-dev,
13 libwxgtk3.0-dev,
14 libx11-dev,
15+ libxml2-dev,
16 locales | locales-all,
17 portaudio19-dev,
18 zlib1g-dev
19diff --git a/debian/create_built_tarball.sh b/debian/create_built_tarball.sh
20index 7ab5f9a..da81773 100644
21--- a/debian/create_built_tarball.sh
22+++ b/debian/create_built_tarball.sh
23@@ -91,7 +91,7 @@ remove_not_yet_free_plugin()
24 {
25 echo "Remove non free plugins"
26 # remove also deprecated plugins
27- for plugin in CDVDiso CDVDisoEFP CDVDlinuz CDVDolio CDVDpeops dev9ghzdrk PeopsSPU2 SSSPSXPAD USBqemu xpad zerogs zerospu2
28+ for plugin in CDVDiso CDVDisoEFP CDVDlinuz CDVDolio CDVDpeops PeopsSPU2 SSSPSXPAD USBqemu xpad zerogs zerospu2
29 do
30 rm -fr $LOCAL_REPO/plugins/$plugin
31 done
32diff --git a/debian/postinst b/debian/postinst
33new file mode 100755
34index 0000000..a81fe9f
35--- /dev/null
36+++ b/debian/postinst
37@@ -0,0 +1,6 @@
38+#!/bin/bash
39+set -e
40+echo 'Enabling networking capability on Linux...'
41+set -x
42+setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' /usr/games/PCSX2
43+set +x

Subscribers

People subscribed via source and target branches

to all changes: