diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-20 12:25:49 +0100 |
| commit | a74b8da459dcdee1d1fc633d9d1856fdb89fd7bd (patch) | |
| tree | 291ff6b5793e74c8994696a7fe26e82f6f646601 /package/mplayer | |
| parent | 33adad70313bb73464cbd002370cd14bade79a54 (diff) | |
fix musl compile, when xorg package collection is selected. X still does not work with musl
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 4 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-Makefile | 12 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-libao2_ao_alsa_c | 6 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-loader_ldt_keeper_c | 11 |
4 files changed, 22 insertions, 11 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index c4a6872f2..2a6b2533f 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.1 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac7bf1cfedc1c5c24bfc83107eefb1d9 +PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile index bb8529c8c..ac5d6285b 100644 --- a/package/mplayer/patches/patch-Makefile +++ b/package/mplayer/patches/patch-Makefile @@ -1,14 +1,14 @@ ---- mplayer-1.0-32749.orig/Makefile 2011-01-03 11:27:11.000000000 +0100 -+++ mplayer-1.0-32749/Makefile 2011-07-29 17:44:21.073424743 +0200 -@@ -185,7 +185,6 @@ SRCS_COMMON-$(NEED_STRSEP) += - SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c - SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c +--- MPlayer-1.1.1.orig/Makefile 2012-05-30 23:21:46.000000000 +0200 ++++ MPlayer-1.1.1/Makefile 2013-11-14 13:20:30.000000000 +0100 +@@ -190,7 +190,6 @@ SRCS_COMMON-$(NATIVE_RTSP) += + stream/librtsp/rtsp_session.c \ + SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \ - stream/asf_mmst_streaming.c \ stream/asf_streaming.c \ stream/cookies.c \ stream/http.c \ -@@ -816,7 +815,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +@@ -794,7 +793,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h diff --git a/package/mplayer/patches/patch-libao2_ao_alsa_c b/package/mplayer/patches/patch-libao2_ao_alsa_c index 26d0832dc..b943dc8a9 100644 --- a/package/mplayer/patches/patch-libao2_ao_alsa_c +++ b/package/mplayer/patches/patch-libao2_ao_alsa_c @@ -1,6 +1,6 @@ ---- mplayer-1.0-32749.orig/libao2/ao_alsa.c 2011-01-03 11:26:52.000000000 +0100 -+++ mplayer-1.0-32749/libao2/ao_alsa.c 2011-09-14 20:52:35.457990653 +0200 -@@ -760,8 +760,9 @@ static int play(void* data, int len, int +--- MPlayer-1.1.1.orig/libao2/ao_alsa.c 2012-04-10 15:17:49.000000000 +0200 ++++ MPlayer-1.1.1/libao2/ao_alsa.c 2013-11-14 13:20:30.000000000 +0100 +@@ -756,8 +756,9 @@ static int play(void* data, int len, int { int num_frames; snd_pcm_sframes_t res = 0; diff --git a/package/mplayer/patches/patch-loader_ldt_keeper_c b/package/mplayer/patches/patch-loader_ldt_keeper_c new file mode 100644 index 000000000..d2f42d46a --- /dev/null +++ b/package/mplayer/patches/patch-loader_ldt_keeper_c @@ -0,0 +1,11 @@ +--- MPlayer-1.1.1.orig/loader/ldt_keeper.c 2011-05-24 21:51:38.000000000 +0200 ++++ MPlayer-1.1.1/loader/ldt_keeper.c 2013-11-14 13:24:09.000000000 +0100 +@@ -210,7 +210,7 @@ ldt_fs_t* Setup_LDT_Keeper(void) + array.seg_not_present=0; + array.contents=MODIFY_LDT_CONTENTS_DATA; + array.limit_in_pages=0; +-#ifdef __linux__ ++#if defined(__linux__) && (__GLIBC__) + //ret=LDT_Modify(0x1, &array, sizeof(struct modify_ldt_ldt_s)); + ret=modify_ldt(0x1, &array, sizeof(struct modify_ldt_ldt_s)); + if(ret<0) |