diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 10:14:06 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 10:14:06 +0100 |
| commit | ed6090a791ac0bd072ad557510948e961235cb56 (patch) | |
| tree | 696466d65e1e01b693e2726d336dccefcc135b99 /package/vlc | |
| parent | 1b2e03fec9d95801923f45c09d484ee599cad564 (diff) | |
| parent | 9e2fdf23756dc13ce89f0ca185a6223c02d3f14a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/vlc')
| -rw-r--r-- | package/vlc/Makefile | 7 | ||||
| -rw-r--r-- | package/vlc/patches/patch-modules_text_renderer_freetype_c | 11 |
2 files changed, 4 insertions, 14 deletions
diff --git a/package/vlc/Makefile b/package/vlc/Makefile index 67f0ec763..74ab64ef7 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= vlc -PKG_VERSION:= 2.1.1 +PKG_VERSION:= 2.1.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1331cd853d56762c96afcb92dd498348 -PKG_DESCR:= Media Player +PKG_MD5SUM:= 7ed67d22f7425011078772bfc62ac222 +PKG_DESCR:= popular media player PKG_SECTION:= multimedia PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt @@ -23,6 +23,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,VLC,vlc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE -D_POSIX_SOURCE TARGET_CFLAGS+= -fPIC CONFIGURE_ENV+= ac_cv_func_sched_getaffinity=no CONFIGURE_ARGS+= --disable-lua \ diff --git a/package/vlc/patches/patch-modules_text_renderer_freetype_c b/package/vlc/patches/patch-modules_text_renderer_freetype_c deleted file mode 100644 index 0c25fcfdf..000000000 --- a/package/vlc/patches/patch-modules_text_renderer_freetype_c +++ /dev/null @@ -1,11 +0,0 @@ ---- vlc-2.1.1.orig/modules/text_renderer/freetype.c 2013-09-12 17:18:34.000000000 +0200 -+++ vlc-2.1.1/modules/text_renderer/freetype.c 2013-12-10 10:13:38.000000000 +0100 -@@ -90,7 +90,7 @@ - #endif - - /* Freetype */ --#include <freetype/ftsynth.h> -+#include <ftsynth.h> - #include FT_FREETYPE_H - #include FT_GLYPH_H - #include FT_STROKER_H |