-
-
Notifications
You must be signed in to change notification settings - Fork 174
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update patches to new offsets in setup.py file
git-svn-id: https://xpra.org/svn/Xpra/trunk@936 3bb7dfac-3a0b-4e04-842a-767bc560f471
- Loading branch information
Showing
6 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ Description: Disable vpx encoding support. | |
| Author: Antoine Martin <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 756) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -228,7 +228,7 @@ | ||
| @@ -230,7 +230,7 @@ | ||
|
|
||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ Description: Disable x264 encoding support. | |
| Author: Antoine Martin <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 756) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -224,7 +224,7 @@ | ||
| @@ -226,7 +226,7 @@ | ||
| ["xpra/wait_for_x_server.pyx"], | ||
| **pkgconfig("x11") | ||
| )) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ Description: Disable vpx encoding support. | |
| Author: Antoine Martin <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 754) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -228,7 +228,7 @@ | ||
| @@ -230,7 +230,7 @@ | ||
|
|
||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ Description: Disable x264 encoding support. | |
| Author: Antoine Martin <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 754) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -224,7 +224,7 @@ | ||
| @@ -226,7 +226,7 @@ | ||
| ["xpra/wait_for_x_server.pyx"], | ||
| **pkgconfig("x11") | ||
| )) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,11 +2,11 @@ Description: Build vpx codec as a static library. | |
| Author: Arthur Huillet <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 747) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -244,6 +244,10 @@ | ||
| @@ -248,6 +248,10 @@ | ||
| **pkgconfig("x264", "libswscale", "libavcodec") | ||
| )) | ||
| ), min_version=(0, 16)) | ||
| if vpx_ENABLED: | ||
| + def pkgconfig(*args): | ||
| + return {'include_dirs': ["/usr/local/include"], | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,9 +2,9 @@ Description: Build x264 codec as a static library. | |
| Author: Arthur Huillet <[email protected]> | ||
| Forwarded: not-needed | ||
|
|
||
| --- a/setup.py (revision 747) | ||
| --- a/setup.py (revision 935) | ||
| +++ b/setup.py (working copy) | ||
| @@ -238,6 +238,10 @@ | ||
| @@ -242,6 +242,10 @@ | ||
| sys.argv = filtered_args | ||
|
|
||
| if x264_ENABLED: | ||
|
|
||