1 files changed, 106 insertions, 106 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 0dfc1ed99..2e04d3c73 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/"
 DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
           libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
           libxv virtual/libx11 libass speex faad2 \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
+       ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 RDEPENDS_${PN} = "mplayer-common"
 PROVIDES = "mplayer"
@@ -33,100 +33,100 @@ FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
 CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
                    /usr/etc/mplayer/example.conf \
                    /usr/etc/mplayer/codecs.conf \
-                   "
+"
 inherit autotools pkgconfig
 EXTRA_OECONF = " \
-        --prefix=/usr \
+    --prefix=/usr \
-        --mandir=${mandir} \
+    --mandir=${mandir} \
-        --target=${SIMPLE_TARGET_SYS} \
+    --target=${SIMPLE_TARGET_SYS} \
-        \
+    \
-        --disable-lirc \
+    --disable-lirc \
-        --disable-lircc \
+    --disable-lircc \
-        --disable-joystick \
+    --disable-joystick \
-        --disable-vm \
+    --disable-vm \
-        --disable-xf86keysym \
+    --disable-xf86keysym \
-        --enable-tv \
+    --enable-tv \
-        --disable-tv-v4l1 \      
+    --disable-tv-v4l1 \     
-        --enable-tv-v4l2 \
+    --enable-tv-v4l2 \
-        --disable-tv-bsdbt848 \
+    --disable-tv-bsdbt848 \
-        --enable-rtc \
+    --enable-rtc \
-        --enable-networking \
+    --enable-networking \
-        --disable-smb \
+    --disable-smb \
-        --enable-live \
+    --enable-live \
-        --disable-dvdnav \
+    --disable-dvdnav \
-        --enable-dvdread \
+    --enable-dvdread \
-        --disable-dvdread-internal \
+    --disable-dvdread-internal \
-        --disable-libdvdcss-internal \
+    --disable-libdvdcss-internal \
-        --disable-cdparanoia \
+    --disable-cdparanoia \
-        --enable-freetype \
+    --enable-freetype \
-        --enable-sortsub \
+    --enable-sortsub \
-        --disable-fribidi \
+    --disable-fribidi \
-        --disable-enca \
+    --disable-enca \
-        --disable-ftp \
+    --disable-ftp \
-        --disable-vstream \
+    --disable-vstream \
-        \
+    \
-        --disable-gif \
+    --disable-gif \
-        --enable-png \
+    --enable-png \
-        --enable-jpeg \
+    --enable-jpeg \
-        --disable-libcdio \
+    --disable-libcdio \
-        --disable-qtx \
+    --disable-qtx \
-        --disable-xanim \
+    --disable-xanim \
-        --disable-real \
+    --disable-real \
-        --disable-xvid \
+    --disable-xvid \
-        \
+    \
-        --enable-speex \
+    --enable-speex \
-        --enable-theora \
+    --enable-theora \
-        --disable-ladspa \
+    --disable-ladspa \
-        --disable-libdv \
+    --disable-libdv \
-        --enable-mad \
+    --enable-mad \
-        --disable-xmms \
+    --disable-xmms \
-        --disable-musepack \
+    --disable-musepack \
-        \
+    \
-        --disable-gl \
+    --disable-gl \
-        --disable-vesa \
+    --disable-vesa \
-        --disable-svga \
+    --disable-svga \
-        --enable-sdl \
+    --enable-sdl \
-        --disable-aa \
+    --disable-aa \
-        --disable-caca \
+    --disable-caca \
-        --disable-ggi \
+    --disable-ggi \
-        --disable-ggiwmh \
+    --disable-ggiwmh \
-        --disable-directx \
+    --disable-directx \
-        --disable-dxr3 \
+    --disable-dxr3 \
-        --disable-dvb \
+    --disable-dvb \
-        --disable-mga \
+    --disable-mga \
-        --disable-xmga \
+    --disable-xmga \
-        --enable-xv \
+    --enable-xv \
-        --disable-vm \
+    --disable-vm \
-        --disable-xinerama \
+    --disable-xinerama \
-        --enable-x11 \
+    --enable-x11 \
-        --enable-fbdev \
+    --enable-fbdev \
-        --disable-3dfx \
+    --disable-3dfx \
-        --disable-tdfxfb \
+    --disable-tdfxfb \
-        --disable-s3fb \
+    --disable-s3fb \
-        --disable-directfb \
+    --disable-directfb \
-        --disable-bl \
+    --disable-bl \
-        --disable-tdfxvid \
+    --disable-tdfxvid \
-        --disable-tga \
+    --disable-tga \
-        --disable-pnm \
+    --disable-pnm \
-        --disable-md5sum \
+    --disable-md5sum \
-        \
+    \
-        --enable-alsa \
+    --enable-alsa \
-        --enable-ossaudio \
+    --enable-ossaudio \
-        --disable-arts \
+    --disable-arts \
-        --disable-esd \
+    --disable-esd \
-        --disable-pulse \
+    --disable-pulse \
-        --disable-jack \
+    --disable-jack \
-        --disable-openal \
+    --disable-openal \
-        --disable-nas \
+    --disable-nas \
-        --disable-sgiaudio \
+    --disable-sgiaudio \
-        --disable-sunaudio \
+    --disable-sunaudio \
-        --disable-win32waveout \
+    --disable-win32waveout \
-        --enable-select \
+    --enable-select \
-        --enable-libass \
+    --enable-libass \
-        \
+    \
-        --extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \
+    --extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \
 "
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
@@ -138,25 +138,25 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 CFLAGS_append = " -I${S}/libdvdread4 "
 do_configure() {
-        sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
+    sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
-        sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
+    sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
-        sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
+    sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
-        sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
+    sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
-        sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
+    sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
-        sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
+    sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
-        export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
+    export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
-        ./configure ${EXTRA_OECONF}
+    ./configure ${EXTRA_OECONF}
-        
+    
 }
 do_compile () {
-        oe_runmake
+    oe_runmake
 }
 do_install_append() {
-        install -d ${D}/usr/etc/mplayer
+    install -d ${D}/usr/etc/mplayer
-        install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
+    install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
-        install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
+    install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
-        install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
+    install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
 }

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 0dfc1ed99..2e04d3c73 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/"
4	DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \	4	DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
5	libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \	5	libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
6	libxv virtual/libx11 libass speex faad2 \	6	libxv virtual/libx11 libass speex faad2 \
7	${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"	7	${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
8		8
9	RDEPENDS_${PN} = "mplayer-common"	9	RDEPENDS_${PN} = "mplayer-common"
10	PROVIDES = "mplayer"	10	PROVIDES = "mplayer"
@@ -33,100 +33,100 @@ FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
33	CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \	33	CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
34	/usr/etc/mplayer/example.conf \	34	/usr/etc/mplayer/example.conf \
35	/usr/etc/mplayer/codecs.conf \	35	/usr/etc/mplayer/codecs.conf \
36	"	36	"
37		37
38	inherit autotools pkgconfig	38	inherit autotools pkgconfig
39		39
40	EXTRA_OECONF = " \	40	EXTRA_OECONF = " \
41	--prefix=/usr \	41	--prefix=/usr \
42	--mandir=${mandir} \	42	--mandir=${mandir} \
43	--target=${SIMPLE_TARGET_SYS} \	43	--target=${SIMPLE_TARGET_SYS} \
44	\	44	\
45	--disable-lirc \	45	--disable-lirc \
46	--disable-lircc \	46	--disable-lircc \
47	--disable-joystick \	47	--disable-joystick \
48	--disable-vm \	48	--disable-vm \
49	--disable-xf86keysym \	49	--disable-xf86keysym \
50	--enable-tv \	50	--enable-tv \
51	--disable-tv-v4l1 \	51	--disable-tv-v4l1 \
52	--enable-tv-v4l2 \	52	--enable-tv-v4l2 \
53	--disable-tv-bsdbt848 \	53	--disable-tv-bsdbt848 \
54	--enable-rtc \	54	--enable-rtc \
55	--enable-networking \	55	--enable-networking \
56	--disable-smb \	56	--disable-smb \
57	--enable-live \	57	--enable-live \
58	--disable-dvdnav \	58	--disable-dvdnav \
59	--enable-dvdread \	59	--enable-dvdread \
60	--disable-dvdread-internal \	60	--disable-dvdread-internal \
61	--disable-libdvdcss-internal \	61	--disable-libdvdcss-internal \
62	--disable-cdparanoia \	62	--disable-cdparanoia \
63	--enable-freetype \	63	--enable-freetype \
64	--enable-sortsub \	64	--enable-sortsub \
65	--disable-fribidi \	65	--disable-fribidi \
66	--disable-enca \	66	--disable-enca \
67	--disable-ftp \	67	--disable-ftp \
68	--disable-vstream \	68	--disable-vstream \
69	\	69	\
70	--disable-gif \	70	--disable-gif \
71	--enable-png \	71	--enable-png \
72	--enable-jpeg \	72	--enable-jpeg \
73	--disable-libcdio \	73	--disable-libcdio \
74	--disable-qtx \	74	--disable-qtx \
75	--disable-xanim \	75	--disable-xanim \
76	--disable-real \	76	--disable-real \
77	--disable-xvid \	77	--disable-xvid \
78	\	78	\
79	--enable-speex \	79	--enable-speex \
80	--enable-theora \	80	--enable-theora \
81	--disable-ladspa \	81	--disable-ladspa \
82	--disable-libdv \	82	--disable-libdv \
83	--enable-mad \	83	--enable-mad \
84	--disable-xmms \	84	--disable-xmms \
85	--disable-musepack \	85	--disable-musepack \
86	\	86	\
87	--disable-gl \	87	--disable-gl \
88	--disable-vesa \	88	--disable-vesa \
89	--disable-svga \	89	--disable-svga \
90	--enable-sdl \	90	--enable-sdl \
91	--disable-aa \	91	--disable-aa \
92	--disable-caca \	92	--disable-caca \
93	--disable-ggi \	93	--disable-ggi \
94	--disable-ggiwmh \	94	--disable-ggiwmh \
95	--disable-directx \	95	--disable-directx \
96	--disable-dxr3 \	96	--disable-dxr3 \
97	--disable-dvb \	97	--disable-dvb \
98	--disable-mga \	98	--disable-mga \
99	--disable-xmga \	99	--disable-xmga \
100	--enable-xv \	100	--enable-xv \
101	--disable-vm \	101	--disable-vm \
102	--disable-xinerama \	102	--disable-xinerama \
103	--enable-x11 \	103	--enable-x11 \
104	--enable-fbdev \	104	--enable-fbdev \
105	--disable-3dfx \	105	--disable-3dfx \
106	--disable-tdfxfb \	106	--disable-tdfxfb \
107	--disable-s3fb \	107	--disable-s3fb \
108	--disable-directfb \	108	--disable-directfb \
109	--disable-bl \	109	--disable-bl \
110	--disable-tdfxvid \	110	--disable-tdfxvid \
111	--disable-tga \	111	--disable-tga \
112	--disable-pnm \	112	--disable-pnm \
113	--disable-md5sum \	113	--disable-md5sum \
114	\	114	\
115	--enable-alsa \	115	--enable-alsa \
116	--enable-ossaudio \	116	--enable-ossaudio \
117	--disable-arts \	117	--disable-arts \
118	--disable-esd \	118	--disable-esd \
119	--disable-pulse \	119	--disable-pulse \
120	--disable-jack \	120	--disable-jack \
121	--disable-openal \	121	--disable-openal \
122	--disable-nas \	122	--disable-nas \
123	--disable-sgiaudio \	123	--disable-sgiaudio \
124	--disable-sunaudio \	124	--disable-sunaudio \
125	--disable-win32waveout \	125	--disable-win32waveout \
126	--enable-select \	126	--enable-select \
127	--enable-libass \	127	--enable-libass \
128	\	128	\
129	--extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \	129	--extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \
130	"	130	"
131		131
132	EXTRA_OECONF_append_armv6 = " --enable-armv6"	132	EXTRA_OECONF_append_armv6 = " --enable-armv6"
@@ -138,25 +138,25 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
138	CFLAGS_append = " -I${S}/libdvdread4 "	138	CFLAGS_append = " -I${S}/libdvdread4 "
139		139
140	do_configure() {	140	do_configure() {
141	sed -i 's\|/usr/include\|${STAGING_INCDIR}\|g' ${S}/configure	141	sed -i 's\|/usr/include\|${STAGING_INCDIR}\|g' ${S}/configure
142	sed -i 's\|/usr/lib\|${STAGING_LIBDIR}\|g' ${S}/configure	142	sed -i 's\|/usr/lib\|${STAGING_LIBDIR}\|g' ${S}/configure
143	sed -i 's\|/usr/\Sinclude[\w/]\|\|g' ${S}/configure	143	sed -i 's\|/usr/\Sinclude[\w/]\|\|g' ${S}/configure
144	sed -i 's\|/usr/\Slib[\w/]\|\|g' ${S}/configure	144	sed -i 's\|/usr/\Slib[\w/]\|\|g' ${S}/configure
145	sed -i 's\|_install_strip="-s"\|_install_strip=""\|g' ${S}/configure	145	sed -i 's\|_install_strip="-s"\|_install_strip=""\|g' ${S}/configure
146	sed -i 's\|HOST_CC\|BUILD_CC\|' ${S}/Makefile	146	sed -i 's\|HOST_CC\|BUILD_CC\|' ${S}/Makefile
147		147
148	export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} \| sed s:${TARGET_VENDOR}::g)"	148	export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} \| sed s:${TARGET_VENDOR}::g)"
149	./configure ${EXTRA_OECONF}	149	./configure ${EXTRA_OECONF}
150		150
151	}	151	}
152		152
153	do_compile () {	153	do_compile () {
154	oe_runmake	154	oe_runmake
155	}	155	}
156		156
157	do_install_append() {	157	do_install_append() {
158	install -d ${D}/usr/etc/mplayer	158	install -d ${D}/usr/etc/mplayer
159	install ${S}/etc/input.conf ${D}/usr/etc/mplayer/	159	install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
160	install ${S}/etc/example.conf ${D}/usr/etc/mplayer/	160	install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
161	install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/	161	install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
162	}	162	}