Merge pull request #296 from TimothyGu/libnut

Delete package libnut

4 files changed, 1 insertions, 41 deletions

diff --git a/index.html b/index.html
index 8ae21a1..f64b173 100644
--- a/index.html
+++ b/index.html
@@ -1671,10 +1671,6 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
         <td class="website"><a href="http://www.nongnu.org/libntlm/">Libntlm</a></td>
     </tr>
     <tr>
-        <td class="package">libnut</td>
-        <td class="website"><a href="https://launchpad.net/libnut">libNUT</a></td>
-    </tr>
-    <tr>
         <td class="package">liboauth</td>
         <td class="website"><a href="http://liboauth.sourceforge.net/">liboauth</a></td>
     </tr>
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index e9939f6..fe1b0d3 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -9,7 +9,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 lame libass libnut libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib
+$(PKG)_DEPS     := gcc bzip2 lame libass libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
@@ -40,7 +40,6 @@ define $(PKG)_BUILD
         --enable-libass \
         --disable-libfaac \
         --enable-libmp3lame \
-        --enable-libnut \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libopus \
diff --git a/src/libnut-1-ftello.patch b/src/libnut-1-ftello.patch
deleted file mode 100644
index e6e8afd..0000000
--- a/src/libnut-1-ftello.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libnut-r681.orig/libnut/priv.h libnut-r681/libnut/priv.h
---- libnut-r681.orig/libnut/priv.h	2013-11-09 09:31:47.000000000 -0800
-+++ libnut-r681/libnut/priv.h	2013-11-23 16:56:13.085645547 -0800
-@@ -45,7 +45,7 @@
- #define ABS(a) ((a) > 0 ? (a) : -(a))
- 
- #if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
--#define ftello(a) ((off_t)(_ftelli64(a)))
-+#define ftello(a) ((off_t)(ftello64(a)))
- #endif
- 
- typedef struct {
diff --git a/src/libnut.mk b/src/libnut.mk
deleted file mode 100644
index 19fe585..0000000
--- a/src/libnut.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG                := libnut
-$(PKG)_IGNORE      :=
-$(PKG)_VERSIONDATE := 20131109
-$(PKG)_VERSIONREV  := r681
-$(PKG)_VERSION     := $($(PKG)_VERSIONDATE)-$($(PKG)_VERSIONREV)
-$(PKG)_CHECKSUM    := 1be2a8a9dcaed632f23141f2f1230f9a47f05a68
-$(PKG)_SUBDIR      := $(PKG)-$($(PKG)_VERSIONREV)
-$(PKG)_FILE        := $(PKG)-$($(PKG)_VERSIONREV).tar.xz
-$(PKG)_URL         := https://launchpad.net/$(PKG)/trunk/$($(PKG)_VERSIONREV)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS        := gcc
-
-define $(PKG)_UPDATE
-    echo 'TODO: Updates for package libnut need to be written.' >&2;
-    echo $(libnut_VERSION)
-endef
-
-define $(PKG)_BUILD
-    $(MAKE) -C '$(1)' -j '$(JOBS)' CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' PREFIX='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)' -j 1 install CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' PREFIX='$(PREFIX)/$(TARGET)'
-endef