diff options
| author | wiz <wiz@pkgsrc.org> | 2012-06-15 08:51:25 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-06-15 08:51:25 +0000 |
| commit | 54580b22fc4c42d4a5b9064850063faf4cd31a12 (patch) | |
| tree | e5bf4bea8d42e70b1be90934131ac650103ae0a3 /multimedia/vlc2 | |
| parent | a3723bf0e9b3f5ae6bc3f339c4a061f0281dffed (diff) | |
| download | pkgsrc-54580b22fc4c42d4a5b9064850063faf4cd31a12.tar.gz | |
Add a workaround so this builds again on NetBSD.
Might make the Darwin situation worse, but at least the build
error will be later now there as well.
Diffstat (limited to 'multimedia/vlc2')
| -rw-r--r-- | multimedia/vlc2/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo index 7fe9cd0f0c4..2696dd845f4 100644 --- a/multimedia/vlc2/distinfo +++ b/multimedia/vlc2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2012/03/21 11:01:50 drochner Exp $ +$NetBSD: distinfo,v 1.5 2012/06/15 08:51:25 wiz Exp $ SHA1 (vlc-2.0.1.tar.xz) = 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 RMD160 (vlc-2.0.1.tar.xz) = 9d932e1be72b65cf47057191d9e84deeedea282c @@ -11,5 +11,6 @@ SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6 SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3 SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15 +SHA1 (patch-modules_gui_qt4_Modules.am) = 3394b42f8f58d433f318ebdf5ffdc052903051de SHA1 (patch-skins-aa) = 9477b095b3e0a1120397c6c9f7102a50c1a63d2b SHA1 (patch-skins-ab) = bf8b3e33db5389dbf04dfedf1d2f1d120afed66a diff --git a/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am b/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am new file mode 100644 index 00000000000..0cd4f1aa71e --- /dev/null +++ b/multimedia/vlc2/patches/patch-modules_gui_qt4_Modules.am @@ -0,0 +1,25 @@ +$NetBSD: patch-modules_gui_qt4_Modules.am,v 1.1 2012/06/15 08:51:25 wiz Exp $ + +Workaround for: +/usr/pkg/share/automake-1.12/am/depend2.am: error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL +/usr/pkg/share/automake-1.12/am/depend2.am: The usual way to define 'am__fastdepOBJCXX' is to add 'AC_PROG_OBJCXX' +/usr/pkg/share/automake-1.12/am/depend2.am: to 'configure.ac' and run 'aclocal' and 'autoconf' again +modules/gui/qt4/Makefile.am: error: Objective C++ source seen but 'OBJCXX' is undefined +modules/gui/qt4/Makefile.am: The usual way to define 'OBJCXX' is to add 'AC_PROG_OBJCXX' +modules/gui/qt4/Makefile.am: to 'configure.ac' and run 'autoconf' again. + +--- modules/gui/qt4/Modules.am.orig 2011-12-08 18:00:26.000000000 +0000 ++++ modules/gui/qt4/Modules.am +@@ -317,9 +317,9 @@ SOURCES_qt4 = qt4.cpp \ + util/buttons/DeckButtonsLayout.cpp \ + util/buttons/RoundButton.cpp + +-if HAVE_DARWIN +-SOURCES_qt4 += util/searchlineedit_mac.mm +-endif ++#if HAVE_DARWIN ++#SOURCES_qt4 += util/searchlineedit_mac.mm ++#endif + + if HAVE_WIN32 + SOURCES_qt4 += main_interface_win32.cpp |