Merge ~kenshen/pcsx2-github-mirror:master into ~helkaluin/pcsx2-github-mirror:master

Proposed by Timothy O'Barr
Status: Merged
Merged at revision: 4c756f5159fd64640eead29b59b75f869905cb2a
Proposed branch: ~kenshen/pcsx2-github-mirror:master
Merge into: ~helkaluin/pcsx2-github-mirror:master
Diff against target: 52 lines (+11/-1)
3 files modified
debian/control (+3/-1)
debian/create_built_tarball.sh (+7/-0)
debian/rules (+1/-0)
Reviewer Review Type Date Requested Status
Jonathan Yip Pending
Review via email: mp+414175@code.launchpad.net

Commit message

Added the on switch for Wayland support. Tested with my pcsx2-git package to have no ill effect on Xorg and enables an otherwise useful feature for pcsx2.

Attempted to add pcap support again. Prior tests from users on the discord suggest's the postinst file is not being run or at least is not applying pcap proper.

To post a comment you must log in.

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 804bc82..c60c6c8 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -24,7 +24,9 @@ Build-Depends: cmake (>= 2.8.5),
6 libxml2-dev,
7 locales | locales-all,
8 portaudio19-dev,
9- zlib1g-dev
10+ zlib1g-dev,
11+ libwayland-dev,
12+ libegl1-mesa-dev
13 Standards-Version: 3.9.3
14 Homepage: http://pcsx2.net/
15
16diff --git a/debian/create_built_tarball.sh b/debian/create_built_tarball.sh
17index 0fbe201..1e4e519 100644
18--- a/debian/create_built_tarball.sh
19+++ b/debian/create_built_tarball.sh
20@@ -112,6 +112,11 @@ remove_dot_git()
21 rm -fr $LOCAL_REPO/.git
22 }
23
24+set_pcap()
25+{
26+ setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' pcsx2
27+}
28+
29 ######################################################################
30 # Main script
31 ######################################################################
32@@ -123,6 +128,8 @@ remove_remaining_non_free_file
33 get_git_version
34 get_pcsx2_version
35
36+set_pcap
37+
38 # must be done after getting the git version
39 remove_dot_git
40
41diff --git a/debian/rules b/debian/rules
42index 80fe74f..9f320f9 100644
43--- a/debian/rules
44+++ b/debian/rules
45@@ -17,6 +17,7 @@ override_dh_auto_configure:
46 -DCMAKE_BUILD_STRIP=FALSE \
47 -DXDG_STD=TRUE \
48 -DDISABLE_ADVANCE_SIMD=TRUE \
49+ -DWAYLAND_API=ON \
50 -DGTK3_API=TRUE \
51 -DPACKAGE_MODE=TRUE \
52 -DLTO_PCSX2_CORE=$(LTO) \

Subscribers

People subscribed via source and target branches

to all changes: