| 1 |
commit: 70ee8e9fac24055830b264113bd86841ffd2fed1 |
| 2 |
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Mar 7 15:05:40 2016 +0000 |
| 4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 7 16:25:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ee8e9f |
| 7 |
|
| 8 |
media-video/aegisub: remove unneeded pthread-flags patch from 9999 |
| 9 |
|
| 10 |
Merged upstream. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
|
| 14 |
media-video/aegisub/aegisub-9999.ebuild | 1 - |
| 15 |
.../aegisub-9999-add-missing-pthread-flags.patch | 44 ---------------------- |
| 16 |
2 files changed, 45 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild |
| 19 |
index 6677686..7a83307 100644 |
| 20 |
--- a/media-video/aegisub/aegisub-9999.ebuild |
| 21 |
+++ b/media-video/aegisub/aegisub-9999.ebuild |
| 22 |
@@ -60,7 +60,6 @@ REQUIRED_USE=" |
| 23 |
# Thus unbundling luabins is not worth the effort. |
| 24 |
PATCHES=( |
| 25 |
"${FILESDIR}/${P}-unbundle-luajit.patch" |
| 26 |
- "${FILESDIR}/${P}-add-missing-pthread-flags.patch" |
| 27 |
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch" |
| 28 |
) |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 9f41ee5..0000000 |
| 34 |
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,44 +0,0 @@ |
| 37 |
-http://devel.aegisub.org/ticket/1902 |
| 38 |
-http://devel.aegisub.org/ticket/1903 |
| 39 |
-http://devel.aegisub.org/ticket/1911 |
| 40 |
- |
| 41 |
-diff --git a/Makefile.inc.in b/Makefile.inc.in |
| 42 |
-index 5a52d25..86f93d1 100644 |
| 43 |
---- a/Makefile.inc.in |
| 44 |
-+++ b/Makefile.inc.in |
| 45 |
-@@ -100,7 +100,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@ |
| 46 |
- LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a |
| 47 |
- LIBS_OPENAL = @OPENAL_LIBS@ |
| 48 |
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ |
| 49 |
--LIBS_PTHREAD = @PTHREAD_LIBS@ |
| 50 |
-+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread |
| 51 |
- LIBS_UCHARDET = @UCHARDET_LIBS@ |
| 52 |
- |
| 53 |
- ifeq (yes, $(BUILD_DARWIN)) |
| 54 |
-diff --git a/libaegisub/Makefile b/libaegisub/Makefile |
| 55 |
-index b021523..77a18ec 100644 |
| 56 |
---- a/libaegisub/Makefile |
| 57 |
-+++ b/libaegisub/Makefile |
| 58 |
-@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o |
| 59 |
- endif |
| 60 |
- |
| 61 |
- aegisub_PCH := $(d)lagi_pre.h |
| 62 |
--aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 63 |
-+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \ |
| 64 |
-+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA) |
| 65 |
- |
| 66 |
- $(d)common/charset.o_FLAGS := $(CFLAGS_UCHARDET) |
| 67 |
- $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV) |
| 68 |
-diff --git a/tools/Makefile b/tools/Makefile |
| 69 |
-index cbf985a..d9f64b8 100644 |
| 70 |
---- a/tools/Makefile |
| 71 |
-+++ b/tools/Makefile |
| 72 |
-@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper |
| 73 |
- endif |
| 74 |
- |
| 75 |
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a |
| 76 |
--repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(PTHREAD_LIBS) |
| 77 |
-+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) |
| 78 |
- repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) |
| 79 |
- |
| 80 |
- PROGRAM += $(d)repack-thes-dict |
Archives