From efa02697a7d3dfd91ff3ed2abb6f1592280694ec Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 15 Sep 2010 13:28:24 +0000 Subject: [PATCH] [media-video/aegisub] Add --as-needed patch --- media-video/aegisub/Manifest | 3 +- media-video/aegisub/aegisub-2.1.8.ebuild | 1 + .../files/aegisub-2.1.8-as_needed.patch | 172 ++++++++++++++++++ 3 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 media-video/aegisub/files/aegisub-2.1.8-as_needed.patch diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest index 88f8f2b68..5e666dde0 100644 --- a/media-video/aegisub/Manifest +++ b/media-video/aegisub/Manifest @@ -1,6 +1,7 @@ +AUX aegisub-2.1.8-as_needed.patch 5891 RMD160 847667b1d754a2dfe9a58a8c3b95f4b6b95dcbb3 SHA1 f841ec4da1cc18063cc602693463e8fa9f1b9e21 SHA256 ff0e6b78fb885d729135c468c90e83eac6e6ea8a57c80876a56ea991f56b7cb8 AUX aegisub-2.1.8-do-not-verify-audiolibs.patch 2673 RMD160 9fe0ffbe1484892d8c38ce3c4426fae8877b2773 SHA1 19fee8597a71b0cef5a03b64f936fc10bd0116c9 SHA256 3176be76afaa906ec847684a350f249c1a02a9eba17b6ed462ca9f3f50907920 AUX aegisub.png 2442 RMD160 1a601ad300c6f13d1914d539759bb84a7b33f7cd SHA1 bcf048af36e66ef79d883cf3aa4e906724888d0e SHA256 9622ddc8e91149c1e4a23f5ce0081ff8ae18e0b42e6e292fa03b55d5542f76df DIST aegisub-2.1.8.tar.gz 2431099 RMD160 d2630f838a9e8720c65d9f18010e80e17fb8183b SHA1 70c51a21c86f73d744fcf1e080e89d98885e557c SHA256 a67356e5c4fa376738d363f1cf5e50aa74e6b69e76a089ed0442bf6d7390d769 -EBUILD aegisub-2.1.8.ebuild 1758 RMD160 81b153b469f89b1114314fa3431600fd8e305e40 SHA1 48c995c1bae3767d586375fe7998a18bdebe16e8 SHA256 dfbc33e4fd4670ee4295d43f2c56eedabf7d4418604450a357969a7a0fe0320b +EBUILD aegisub-2.1.8.ebuild 1801 RMD160 dcf8d98112cfd5a10ee5533799b87de13e01e6b7 SHA1 8891be31cfe16279211d9377606e6a676266df43 SHA256 3a12ef100a9e159cb802b54a8c7f84876677d22a1f6e07ef4e8257b9edccf90d MISC ChangeLog 1494 RMD160 d2cf6582ed89f67788b7ec62338444494bcebbba SHA1 c2bc3ecedc9ce841a388fa415e3cc8d956452304 SHA256 3de57415f11fb728be9b418c6a2d0d7a35857afec26aa3d05c33bd44bbdb507c MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f diff --git a/media-video/aegisub/aegisub-2.1.8.ebuild b/media-video/aegisub/aegisub-2.1.8.ebuild index 7d8ca4002..9be7c9c92 100644 --- a/media-video/aegisub/aegisub-2.1.8.ebuild +++ b/media-video/aegisub/aegisub-2.1.8.ebuild @@ -48,6 +48,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { epatch "${FILESDIR}"/${P}-do-not-verify-audiolibs.patch + epatch "${FILESDIR}"/${P}-as_needed.patch eautoreconf } diff --git a/media-video/aegisub/files/aegisub-2.1.8-as_needed.patch b/media-video/aegisub/files/aegisub-2.1.8-as_needed.patch new file mode 100644 index 000000000..051f43fd9 --- /dev/null +++ b/media-video/aegisub/files/aegisub-2.1.8-as_needed.patch @@ -0,0 +1,172 @@ +Index: m4macros/ac_agi.m4 +=================================================================== +--- m4macros/ac_agi.m4.orig ++++ m4macros/ac_agi.m4 +@@ -1,8 +1,8 @@ + AC_DEFUN([AC_AGI_COMPILE],[ +- aegisub_save_LDFLAGS="$LDFLAGS" ++ aegisub_save_LIBS="$LIBS" + aegisub_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$3" +- LDFLAGS="$4" ++ LIBS="$4" + AC_CACHE_CHECK( + [whether $1 works], [agi_cv_with_$2], + [AC_RUN_IFELSE([$5], +@@ -15,7 +15,7 @@ AC_DEFUN([AC_AGI_COMPILE],[ + fi]) + ]) + CPPFLAGS="$aegisub_save_CPPFLAGS" +- LDFLAGS="$aegisub_save_LDFLAGS" ++ LIBS="$aegisub_save_LIBS" + ]) + + +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -464,10 +464,10 @@ AC_SUBST(ICONV_CFLAGS) + AC_ARG_WITH(alsa, [ --without-alsa build without ALSA audio provider. (default: auto)], alsa_disabled="(disabled)") + + AC_ARG_VAR([ALSA_CFLAGS], [CFLAGS to use for ALSA (default: CPPFLAGS)]) +-AC_ARG_VAR([ALSA_LDFLAGS], [LDFLAGS to use for ALSA (default: -lasound)]) ++AC_ARG_VAR([ALSA_LIBS], [LIBS to use for ALSA (default: -lasound)]) + +-if test -z "$ALSA_LDFLAGS"; then +- ALSA_LDFLAGS="-lasound"; ++if test -z "$ALSA_LIBS"; then ++ ALSA_LIBS="-lasound"; + fi + + if test -z "$ALSA_CFLAGS"; then +@@ -475,10 +475,10 @@ if test -z "$ALSA_CFLAGS"; then + fi + + if test "$with_alsa" != "no"; then +- aegisub_save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$ALSA_LDFLAGS" +- AC_CHECK_LIB([asound], [snd_pcm_open], [ALSA_LDFLAGS="-lasound"; with_alsa="yes"], [with_alsa="no"]) +- LDFLAGS="$aegisub_save_LDFLAGS" ++ aegisub_save_LIBS="$LIBS" ++ LIBS="$ALSA_LIBS" ++ AC_CHECK_LIB([asound], [snd_pcm_open], [ALSA_LIBS="-lasound"; with_alsa="yes"], [with_alsa="no"]) ++ LIBS="$aegisub_save_LIBS" + fi + + if test "$with_alsa" != "no"; then +@@ -487,7 +487,7 @@ if test "$with_alsa" != "no"; then + fi + + AM_CONDITIONAL([HAVE_ALSA], [test "$with_alsa" != "no"]) +-AC_SUBST(ALSA_LDFLAGS) ++AC_SUBST(ALSA_LIBS) + + + ############ +@@ -869,7 +869,7 @@ fi + aegisub_save_LIBS="$LIBS" + LIBS="$LUA_LDFLAGS" + if test "$with_lua" != no; then +- AC_AGI_COMPILE([Lua 5.1 (auto4)], [lua], [$LUA_CFLAGS], [],[ ++ AC_AGI_COMPILE([Lua 5.1 (auto4)], [lua], [$LUA_CFLAGS], [$LUA_LDFLAGS],[ + #include + + int main () { +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -52,32 +52,28 @@ aegisub_2_1_LDADD += libaudio_player.a + if HAVE_ALSA + noinst_LIBRARIES += libaudio_alsa.a + libaudio_alsa_a_SOURCES = audio_player_alsa.cpp +-aegisub_2_1_LDFLAGS += @ALSA_LDFLAGS@ +-aegisub_2_1_LDADD += libaudio_alsa.a ++aegisub_2_1_LDADD += libaudio_alsa.a @ALSA_LIBS@ + endif + + if HAVE_PORTAUDIO + noinst_LIBRARIES += libaudio_portaudio.a + libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp + libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@ +-aegisub_2_1_LDFLAGS += @PORTAUDIO_LIBS@ +-aegisub_2_1_LDADD += libaudio_portaudio.a ++aegisub_2_1_LDADD += libaudio_portaudio.a @PORTAUDIO_LIBS@ + endif + + if HAVE_PULSEAUDIO + noinst_LIBRARIES += libaudio_pulseaudio.a + libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp + libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@ +-aegisub_2_1_LDFLAGS += @LIBPULSE_LIBS@ +-aegisub_2_1_LDADD += libaudio_pulseaudio.a ++aegisub_2_1_LDADD += libaudio_pulseaudio.a @LIBPULSE_LIBS@ + endif + + if HAVE_OPENAL + noinst_LIBRARIES += libaudio_openal.a + libaudio_openal_a_SOURCES = audio_player_openal.cpp + libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@ +-aegisub_2_1_LDFLAGS += @OPENAL_LIBS@ +-aegisub_2_1_LDADD += libaudio_openal.a ++aegisub_2_1_LDADD += libaudio_openal.a @OPENAL_LIBS@ + endif + + if HAVE_OSS +@@ -86,10 +82,6 @@ libaudio_oss_a_SOURCES = audio_player_os + aegisub_2_1_LDADD += libaudio_oss.a + endif + +-if HAVE_FFMPEG +-aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ +-endif +- + if HAVE_PROVIDER_FFMPEG + noinst_LIBRARIES += libaudiovideo_ffmpeg.a + libaudiovideo_ffmpeg_a_SOURCES = audio_provider_lavc.cpp lavc_file.cpp video_provider_lavc.cpp lavc_keyframes.cpp +@@ -101,8 +93,11 @@ if HAVE_PROVIDER_FFMPEGSOURCE + noinst_LIBRARIES += libaudiovideo_ffmpegsource.a + libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp + libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@ +-aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a +-aegisub_2_1_LDFLAGS += @LIBPOSTPROC_LIBS@ ++aegisub_2_1_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a @LIBPOSTPROC_LIBS@ ++endif ++ ++if HAVE_FFMPEG ++aegisub_2_1_LDADD += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@ + endif + + noinst_LIBRARIES += libsubtitle_provider.a +@@ -115,8 +110,7 @@ noinst_LIBRARIES += libsubtitle_ass.a + libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp + libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@ + LIBS += @LIBASS_LIBS@ +-aegisub_2_1_LDADD += libsubtitle_ass.a +-aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@ ++aegisub_2_1_LDADD += libsubtitle_ass.a @FONTCONFIG_LIBS@ + endif + + if WITH_CSRI +@@ -124,8 +118,7 @@ noinst_LIBRARIES += libsubtitle_csri.a + libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp + libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@ + LIBS += @CSRI_LIBS@ +-aegisub_2_1_LDADD += libsubtitle_csri.a +-aegisub_2_1_LDFLAGS += @FONTCONFIG_LIBS@ ++aegisub_2_1_LDADD += libsubtitle_csri.a @FONTCONFIG_LIBS@ + endif + + if HAVE_AUTO4_LUA +@@ -169,8 +162,7 @@ endif + if HAVE_HUNSPELL + noinst_LIBRARIES += libmisc_hunspell.a + libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp +-aegisub_2_1_LDFLAGS += @HUNSPELL_LIBS@ +-aegisub_2_1_LDADD += libmisc_hunspell.a ++aegisub_2_1_LDADD += libmisc_hunspell.a @HUNSPELL_LIBS@ + endif + + if HAVE_UNIVCHARDET +