summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-07-05 13:29:22 +0000
committerwiz <wiz@pkgsrc.org>2013-07-05 13:29:22 +0000
commit5c188a14f17c21afa92186ad4f3925878ad99d6e (patch)
tree8f0c8763b5be71d6cddfcd37fc5be565b85decce
parent3c4f1e2442f4f01b268c0bd79d4ee7e86b0a39e2 (diff)
downloadpkgsrc-5c188a14f17c21afa92186ad4f3925878ad99d6e.tar.gz
Remove patch that doesn't apply (was committed with lua PKGREVISION bump).
-rw-r--r--multimedia/vlc2/distinfo3
-rw-r--r--multimedia/vlc2/patches/patch-configure.ac67
2 files changed, 1 insertions, 69 deletions
diff --git a/multimedia/vlc2/distinfo b/multimedia/vlc2/distinfo
index 1fcc3d34264..1174052ae47 100644
--- a/multimedia/vlc2/distinfo
+++ b/multimedia/vlc2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2013/07/04 21:27:58 adam Exp $
+$NetBSD: distinfo,v 1.18 2013/07/05 13:29:22 wiz Exp $
SHA1 (vlc-2.0.6.tar.xz) = 2ce21c949275702452bb1327febf6e98748a7972
RMD160 (vlc-2.0.6.tar.xz) = 836d07c84da5980e321dce5c3f45b5b1b4814d84
@@ -18,7 +18,6 @@ SHA1 (patch-at) = bf48ded3571358d6b718af47b28804c3155d84ef
SHA1 (patch-au) = 5ea53969efefe3d9a6e3121b5453b573c633124b
SHA1 (patch-av) = c82b711947ea4bdca9b011e36af6c87d9b6f62a6
SHA1 (patch-ba) = 1898a7a9bf6a45ab4915f1c46df325e6d41ada23
-SHA1 (patch-configure.ac) = 5909636b965fa4dcebdb978c74a1d28771313756
SHA1 (patch-modules_access_directory.c) = e36df1da5b788e12e9fc7d94663dd69d86fe4f7a
SHA1 (patch-modules_access_rtp_Modules.am) = 14aea82ffab2fcfa5b0916ac2e86363d1efdcbf3
SHA1 (patch-modules_audio__output_pulse.c) = 941ee669e62c9d757fc096c74a2aec58cf265b15
diff --git a/multimedia/vlc2/patches/patch-configure.ac b/multimedia/vlc2/patches/patch-configure.ac
deleted file mode 100644
index 7169c9adc7d..00000000000
--- a/multimedia/vlc2/patches/patch-configure.ac
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2013/07/04 21:27:58 adam Exp $
-
-Fix configuring on Darwin with newer Xcode.
-
---- configure.ac.orig 2013-05-09 21:53:17.000000000 +0000
-+++ configure.ac
-@@ -135,22 +135,6 @@ case "${host_os}" in
- ;;
- darwin*)
-
-- dnl Force gcc "-arch" flag
-- ARCH_flag=""
-- case "${host}" in
-- i?86*)
-- ARCH_flag="-arch i386"
-- ;;
-- ppc64*)
-- ARCH_flag="-arch ppc64"
-- ;;
-- ppc*)
-- ARCH_flag="-arch ppc"
-- ;;
-- x86_64*)
-- ARCH_flag="-arch x86_64"
-- ;;
-- esac
-
- SYS=darwin
- CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CFLAGS="${CFLAGS_save}"
-@@ -175,37 +159,6 @@ case "${host_os}" in
- AC_LIBOBJ([strndup])
- AC_LIBOBJ([strnlen])],)
-
-- dnl
-- dnl Check for Mac OS X SDK settings
-- dnl
-- AC_ARG_WITH(macosx-sdk,
-- [AS_HELP_STRING([--with-macosx-sdk=DIR],
-- [compile using the SDK in DIR])])
-- test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk
-- test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
-- CPP="${CPP} -isysroot ${with_macosx_sdk}"
-- CC="${CC} -isysroot ${with_macosx_sdk}"
-- CXX="${CXX} -isysroot ${with_macosx_sdk}"
-- OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
-- LD="${LD} -syslibroot ${with_macosx_sdk}"
-- AC_ARG_WITH(macosx-version-min,
-- [AS_HELP_STRING([--with-macosx-version-min=VERSION],
-- [compile for MacOS X VERSION and above])])
-- if test "${with_macosx_version_min}" = "" ; then
-- with_macosx_version_min=10.5
-- fi
-- if test "${with_macosx_version_min}" != "" ; then
-- CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
-- CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
-- CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
-- OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
-- LD="${LD} -macosx_version_min=${with_macosx_version_min}"
-- CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CFLAGS="${CFLAGS_save}"
-- CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CXXFLAGS="${CXXFLAGS_save}"
-- OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; OBJCFLAGS="${OBJCFLAGS_save}"
-- MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
-- export MACOSX_DEPLOYMENT_TARGET
-- fi
- ;;
- *mingw32* | *cygwin* | *wince* | *mingwce*)
- AC_CHECK_TOOL(WINDRES, windres, :)