[vlc-commits] commit: Contribs: remove dead patches (Jean-Baptiste Kempf )
git at videolan.org
git at videolan.org
Tue Jun 1 01:39:45 CEST 2010
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jun 1 01:39:30 2010 +0200| [c631f1022b56545f4c083ddc5586c21c7c4b18b8] | committer: Jean-Baptiste Kempf
Contribs: remove dead patches
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c631f1022b56545f4c083ddc5586c21c7c4b18b8
---
extras/contrib/src/Patches/firefox-darwin.patch | 62 -------------
extras/contrib/src/Patches/glib-Darwin64.patch | 16 ----
.../contrib/src/Patches/glib-remove-gtkdoc.patch | 96 --------------------
extras/contrib/src/Patches/libprojectM-fpic.patch | 41 ---------
4 files changed, 0 insertions(+), 215 deletions(-)
diff --git a/extras/contrib/src/Patches/firefox-darwin.patch b/extras/contrib/src/Patches/firefox-darwin.patch
deleted file mode 100644
index a13b975..0000000
--- a/extras/contrib/src/Patches/firefox-darwin.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- xpcom/typelib/xpidl/Makefile.in 2009-06-27 21:34:20.000000000 +0200
-+++ xpcom/typelib/xpidl/Makefile.in 2009-06-27 21:34:20.000000000 +0200
-@@ -77,59 +77,6 @@
- USE_STATIC_LIBS = 1
- endif
-
--ifeq ($(OS_ARCH),Darwin)
--# The only reason to not always strip the SDK out is that the libraries
--# in / on ppc currently aren't fat, preventing the target xpidl from linking
--# on a ppc->x86 build. The SDK, presumably 10.4u, must be included in that
--# case in order to successfully link. Because the target xpidl isn't
--# currently built in a cross compile, though, this point is moot for the
--# time being.
--
--ifndef CROSS_COMPILE
--# When doing a native build, don't build xpidl against the SDK. libIDL
--# was most likely configured for the system headers, and bringing in the
--# SDK's headers instead will cause problems.
--_STRIP_SDK = 1
--else
--
--# Cross-compiling
--
--# Don't build xpidl for the target. This is not intended to be a permanent
--# solution. It's necessary because it is presently difficult to build
--# xpidl's prerequisites (libIDL and glib) as fat and suitable for a cross.
--# This will be fixed. -mm
--PROGRAM=
--
--# Since only host_xpidl will be built for now, always strip out the SDK
--# (as above).
--_STRIP_SDK=1
--
--# When fat xpidl prerequisites are available, the PROGRAM= and _STRIP_SDK=1
--# above are expected to disappear, and be replaced with the following
--# conditonal.
--
--# ifeq (86_powerpc,$(findstring 86,$(host_cpu))_$(TARGET_CPU))
--# # When cross-compiling from x86 to ppc, an old (10.2-ish) SDK might be in
--# # use, and libIDL will have been configured for new (10.4-ish) headers.
--# _STRIP_SDK = 1
--# endif
--
--endif # CROSS_COMPILE
--
--ifneq (,$(_STRIP_SDK)$(MACOS_SDK_DIR))
--# libIDL is configured for the system's headers, with no SDK involved.
--# There may be header conflicts if the SDK used for the Mozilla build
--# is used here. There are very few specific cases where the SDK needs to
--# remain set to build xpidl.
--NEXT_ROOT=
--OS_CFLAGS := $(shell echo $(OS_CFLAGS)|sed -E -e "s%((-I|-isystem )$(MACOS_SDK_DIR)/usr/(include|lib/gcc)[^ ]*)|-F$(MACOS_SDK_DIR)(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*|-isysroot $(MACOS_SDK_DIR)%%g")
--OS_CFLAGS := $(patsubst -I$(MACOS_SDK_DIR)%,-I%,$(OS_CFLAGS))
--OS_LIBS := $(patsubst -L$(MACOS_SDK_DIR)/usr/lib%,,$(OS_LIBS))
--LDFLAGS := $(shell echo $(LDFLAGS)|sed -E -e "s%-Wl,-syslibroot,$(MACOS_SDK_DIR)%%g")
--endif # _STRIP_SDK
--
--endif # Darwin
--
- include $(topsrcdir)/config/rules.mk
-
- CFLAGS += $(LIBIDL_CFLAGS)
diff --git a/extras/contrib/src/Patches/glib-Darwin64.patch b/extras/contrib/src/Patches/glib-Darwin64.patch
deleted file mode 100644
index 59131d2..0000000
--- a/extras/contrib/src/Patches/glib-Darwin64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- glib/gconvert.c 2009-06-27 05:18:06.000000000 +0200
-+++ glib/gconvert.c 2009-08-31 02:11:23.000000000 +0200
-@@ -48,13 +48,6 @@
-
- #include "glibintl.h"
-
--#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
--#error GNU libiconv in use but included iconv.h not from libiconv
--#endif
--#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
--#error GNU libiconv not in use but included iconv.h is from libiconv
--#endif
--
- #include "galias.h"
-
- GQuark
diff --git a/extras/contrib/src/Patches/glib-remove-gtkdoc.patch b/extras/contrib/src/Patches/glib-remove-gtkdoc.patch
deleted file mode 100644
index b43ff02..0000000
--- a/extras/contrib/src/Patches/glib-remove-gtkdoc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru configure.in configure.in
---- configure.in 2009-06-27 05:34:30.000000000 +0200
-+++ configure.in 2009-06-27 12:45:40.000000000 +0200
-@@ -2600,8 +2600,6 @@
- dnl *** Checks for gtk-doc ***
- dnl **************************
-
--GTK_DOC_CHECK([1.11])
--
- AC_ARG_ENABLE(man,
- [AC_HELP_STRING([--enable-man],
- [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-diff -ru Makefile.am Makefile.am
---- Makefile.am 2009-05-08 01:57:50.000000000 +0200
-+++ Makefile.am 2009-06-27 12:43:41.000000000 +0200
-@@ -3,7 +3,7 @@
-
- AUTOMAKE_OPTIONS = 1.7
-
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po
- DIST_SUBDIRS = $(SUBDIRS) build
-
- bin_SCRIPTS = glib-gettextize
-@@ -68,8 +68,7 @@
- INSTALL \
- ChangeLog \
- glibconfig.h.win32 \
-- config.h.win32 \
-- gtk-doc.make
-+ config.h.win32
-
- configexecincludedir = $(libdir)/glib-2.0/include
- configexecinclude_DATA = glibconfig.h
-diff -ru autogen.sh autogen.sh
---- autogen.sh 2009-06-27 03:57:54.000000000 +0200
-+++ autogen.sh 2009-06-27 12:32:21.000000000 +0200
-@@ -29,14 +29,6 @@
- DIE=1
- fi
-
--(gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
-- echo
-- echo "You must have gtk-doc installed to compile $PROJECT."
-- echo "Install the appropriate package for your distribution,"
-- echo "or get the source tarball at ftp://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-- DIE=1
--}
--
- (autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "You must have autoconf installed to compile $PROJECT."
-@@ -107,7 +99,6 @@
- $ACLOCAL $ACLOCAL_FLAGS || exit $?
-
- libtoolize --force || exit $?
--gtkdocize || exit $?
-
- autoheader || exit $?
-
-diff -ru docs/reference/gio/Makefile.am docs/reference/gio/Makefile.am
---- docs/reference/gio/Makefile.am 2009-06-27 05:34:30.000000000 +0200
-+++ docs/reference/gio/Makefile.am 2009-06-27 12:37:01.000000000 +0200
-@@ -104,7 +104,6 @@
- version.xml.in \
- gvfs-overview.odg
-
--include $(top_srcdir)/gtk-doc.make
-
- EXTRA_DIST += \
- version.xml.in
-diff -ru docs/reference/glib/Makefile.am docs/reference/glib/Makefile.am
---- docs/reference/glib/Makefile.am 2009-04-01 01:04:20.000000000 +0200
-+++ docs/reference/glib/Makefile.am 2009-06-27 12:39:09.000000000 +0200
-@@ -69,9 +69,6 @@
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=
-
--# include common portion ...
--include $(top_srcdir)/gtk-doc.make
--
- # Other files to distribute
- EXTRA_DIST += \
- file-name-encodings.png \
-diff -ru docs/reference/gobject/Makefile.am docs/reference/gobject/Makefile.am
---- docs/reference/gobject/Makefile.am 2009-04-01 01:04:20.000000000 +0200
-+++ docs/reference/gobject/Makefile.am 2009-06-27 12:40:34.000000000 +0200
-@@ -58,8 +58,6 @@
- # Extra options to supply to gtkdoc-fixref
- FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html
-
--include $(top_srcdir)/gtk-doc.make
--
- # Other files to distribute
- EXTRA_DIST += \
- gobject.cI \
diff --git a/extras/contrib/src/Patches/libprojectM-fpic.patch b/extras/contrib/src/Patches/libprojectM-fpic.patch
deleted file mode 100644
index 609ef39..0000000
--- a/extras/contrib/src/Patches/libprojectM-fpic.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: src/libprojectM/MilkdropPresetFactory/CMakeLists.txt
-===================================================================
---- src/libprojectM/MilkdropPresetFactory/CMakeLists.txt (revision 1287)
-+++ src/libprojectM/MilkdropPresetFactory/CMakeLists.txt (working copy)
-@@ -3,7 +3,7 @@
-
- SET(MilkdropPresetFactory_SOURCES BuiltinFuncs.cpp Func.cpp MilkdropPreset.cpp Param.hpp PresetFrameIO.cpp CustomShape.cpp Eval.cpp MilkdropPresetFactory.cpp PerPixelEqn.cpp BuiltinParams.cpp InitCond.cpp Parser.cpp CustomWave.cpp Expr.cpp PerPointEqn.cpp Param.cpp PerFrameEqn.cpp IdlePreset.cpp)
-
--SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC)
-+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
- LINK_DIRECTORIES(${projectM_BINARY_DIR} ${Renderer_BINARY_DIR})
-Index: src/libprojectM/NativePresetFactory/CMakeLists.txt
-===================================================================
---- src/libprojectM/NativePresetFactory/CMakeLists.txt (revision 1287)
-+++ src/libprojectM/NativePresetFactory/CMakeLists.txt (working copy)
-@@ -2,7 +2,7 @@
- cmake_minimum_required(VERSION 2.4.0)
-
- SET(NativePresetFactory_SOURCES NativePresetFactory.cpp)
--SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC)
-+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR})
- ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES})
-Index: src/libprojectM/Renderer/CMakeLists.txt
-===================================================================
---- src/libprojectM/Renderer/CMakeLists.txt (revision 1287)
-+++ src/libprojectM/Renderer/CMakeLists.txt (working copy)
-@@ -7,8 +7,8 @@
- Filters.cpp PerlinNoise.cpp PipelineContext.cpp Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp
- RenderItemDistanceMetric.cpp RenderItemMatcher.cpp ${SOIL_SOURCES})
-
--SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fPIC)
--SET (CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -fPIC)
-+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-+SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
More information about the vlc-commits
mailing list