[vlc-commits] Remove unused Maemo5 old stuff

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Oct 31 18:03:37 2011 +0200| [336185ed987faf592a31fc9a86cf75f0c356cde3] | committer: Rémi Denis-Courmont

Remove unused Maemo5 old stuff

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=336185ed987faf592a31fc9a86cf75f0c356cde3
---

 .../src/Patches/ffmpeg-avcodec-no-thumb.patch      |   10 -------
 extras/contrib/src/contrib-src.mak                 |   26 +------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch b/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch
deleted file mode 100644
index 21b51a5..0000000
--- a/extras/contrib/src/Patches/ffmpeg-avcodec-no-thumb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: ffmpeg/libavcodec/Makefile
-===================================================================
---- ffmpeg/libavcodec/Makefile	(révision 19635)
-+++ ffmpeg/libavcodec/Makefile	(copie de travail)
-@@ -1,4 +1,5 @@
- include $(SUBDIR)../config.mak
-+CFLAGS+=-mno-thumb
- 
- NAME = avcodec
- FFLIBS = avutil
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 4477743..89012d4 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -122,19 +122,6 @@ HOSTCONF+= --without-pic --disable-shared
 endif
 
 
-ifdef HAVE_LINUX
-ifdef HAVE_MAEMO
-# Really, this could be done on all Linux platforms, not just Maemo.
-# Installing statically-linked VLC plugins is so much simpler.
-HOSTCONF += --with-pic --disable-shared
-endif
-endif
-
-
-ifdef HAVE_ISA_THUMB
-NOTHUMB ?= -mno-thumb
-endif
-
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -1029,12 +1016,6 @@ ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
 endif
 
-ifdef HAVE_MAEMO
-ifneq ($(filter -m%=cortex-a8, $(EXTRA_CFLAGS)),)
-FFMPEGCONF += $(FFMPEGCONFNEON)
-endif
-endif
-
 ifdef HAVE_ANDROID
 ifdef HAVE_NEON
 FFMPEGCONF += $(FFMPEGCONFNEON)
@@ -1084,9 +1065,6 @@ ifdef GIT
 
 ffmpeg:
 	$(GIT) clone $(FFMPEG_GIT)
-ifdef HAVE_ISA_THUMB
-	patch -p0 < Patches/ffmpeg-avcodec-no-thumb.patch
-endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1275,7 +1253,7 @@ LIVE_TARGET-$(HAVE_WIN32)     = mingw
 LIVE_TARGET-$(HAVE_WINCE)     = mingw
 LIVE_TARGET-$(HAVE_DARWIN_OS) = macosx
 
-ifeq ($(ARCH)$(HAVE_MAEMO),armel)
+ifeq ($(ARCH),armel)
 LIVE_TARGET-$(ENABLED)        = armlinux
 endif
 
@@ -1289,7 +1267,7 @@ LIVE_PATCH-$(HAVE_DARWIN_OS) = sed -e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXT
 LIVE_PATCH-$(HAVE_LINUX)     = sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head
 
 ifndef HAVE_UCLIBC
-ifneq ($(ARCH)$(HAVE_MAEMO),armel)
+ifneq ($(ARCH),armel)
 LIVE_PATCH-$(HAVE_LINUX)    += ; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
 endif
 endif