Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	MPlayer.spec
@@ -4,13 +4,15 @@ %define suseversion %(echo "openSUSE Linux `echo "scale=1; %{suse_version}/100" \| bc 2>/dev/null \|\| echo UNKNOWN` (%{_build_cpu})") -%define revision 33269 +%define revision 34277 + +%define x264_rev 20111029 Name: MPlayer License: GNU General Public License version 2 (GPL v2) Group: Productivity/Multimedia/Video/Players Version: 1.0rc4_r%{revision} -Release: 1 +Release: 1.1 Summary: Multimedia Player Summary(de): Multimedia-Abspielprogramm ## Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.bz2 @@ -27,10 +29,12 @@ Patch11: MPlayer-pa-volume-fix.patch Patch12: MPlayer-disable_subrip.patch Patch13: MPlayer-fix_win32_pointer_casts.patch +Patch14: MPlayer-x264_pkgconfig.patch Patch20: MPlayer-svn_version.patch ## git://git.videolan.org/ffmpeg.git -Source10: ffmpeg-c104a6e90226eaa253aeba471c8859e0da922da7.tar.bz2 -Patch80: ffmpeg-fix_missing_return_in_non_void_function.patch +Source10: ffmpeg-49aa397414eb4dbe5da292fcdb8a6084f71ae949.tar.bz2 +Patch30: ffmpeg-fix_sequence-point.patch +Source11: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{x264_rev}-2245.tar.bz2 Source100: MPlayer-rpmlintrc URL: http://www.mplayerhq.hu BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,16 +56,21 @@ BuildRequires: libvdpau-devel BuildRequires: libpng-devel BuildRequires: libvpx-devel >= 0.9.6 -BuildRequires: libx264-devel >= 0.0svn20080917 live libjack-devel giflib giflib-devel libjpeg-devel +#BuildRequires: libx264-devel >= 0.115svn20110520 +BuildRequires: live libjack-devel giflib giflib-devel libjpeg-devel BuildRequires: krb5-devel openldap2-devel libgssapi libdv-devel libcaca-devel libpulse-devel BuildRequires: coreutils BuildRequires: libmpg123-devel -BuildRequires: libbluray-devel +BuildRequires: libbluray-devel >= 0+20111019 BuildRequires: librtmp-devel BuildRequires: liba52-devel BuildRequires: bs2b-devel BuildRequires: libdvdcss-devel BuildRequires: libcrystalhd-devel +%if 0%{?suse_version} >= 1130 +BuildRequires: linux-glibc-devel kernel-devel +%endif +BuildRequires: libcrystalhd-devel %if %suse_version > 1110 BuildRequires: lirc-devel %else @@ -75,7 +84,7 @@ # Toni builds dirac from 10.3 on upwards %if %{suse_version} >= 1030 -BuildRequires: libdirac-devel libschroedinger-devel +BuildRequires: dirac-devel schroedinger-devel %endif Provides: mplayer = %{version}-%{release} @@ -95,13 +104,6 @@ Note that the GUI frontend "gmplayer" is not part of this package. Instead, you must also install the package "gmplayer". - - - -Authors: --------- - MPlayer team <mplayer-users@mplayerhq.hu> - %package -n gmplayer Summary: GUI Frontend for the %{name} Multimedia Player Group: Productivity/Multimedia/Video/Players @@ -129,9 +131,8 @@ This subpackage contains technical documentation about codecs, formats, and MPlayer implementation details. - %prep -%setup -q -a 1 -a 2 -a 10 +%setup -q -a 1 -a 2 -a 10 -a 11 %patch0 ### fix me! ### %if %suse_version >= 1110 @@ -148,16 +149,35 @@ %endif %patch12 %patch13 +%patch14 # only apply if packaging an SVN snapshot: %if 0%{?revision} %patch20 %endif +# ffmpeg patches: pushd ffmpeg -%patch80 +%if 0%{?suse_version} < 1120 +%patch30 +%endif popd #ffmpeg +%__ln_s "x264-snapshot-%{x264_rev}-2245" x264 + %build +X264_INST="$PWD/x264_inst" +pushd x264 +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" x264.c +CFLAGS="%{optflags}" CCFLAGS="%{optflags}" \ +./configure --prefix="$X264_INST" --libdir="$X264_INST/lib" --disable-shared --enable-static --enable-pic +%__make %{?_smp_flags} +%__install -d "$X264_INST" +%__make install +popd #x264 + +export PKG_CONFIG_PATH="$X264_INST/lib/pkgconfig:$PKG_CONFIG_PATH" + %if 0%{?revision} %__sed -i 's\|@@SVN_REVISION@@\|%{revision}\|g;s\|@@SUSE_VERSION@@\|%{suseversion}-Packman\|g' ./version.sh %else @@ -182,15 +202,22 @@ %ifarch %ix86 x86_64 --enable-runtime-cpudetection \ %endif - --enable-bl --enable-fbdev --enable-zr \ + --enable-bl --enable-fbdev \ --enable-gui --enable-menu --language=all \ --enable-xvmc --with-xvmclib=XvMCW \ - --enable-largefiles --enable-smb --enable-joystick \ + --enable-smb --enable-joystick \ --enable-radio --enable-radio-capture \ --enable-dvdnav \ --disable-nemesi \ --disable-wii \ --enable-faad \ +%if 0%{?suse_version} > 1140 + --disable-tv-v4l1 \ + --enable-v4l2 \ + --disable-zr \ +%else + --enable-zr \ +%endif %ifarch %ix86 --enable-qtx \ %else @@ -412,7 +439,7 @@ %dir %{_datadir}/mplayer/skins %{_datadir}/mplayer/skins/* %{_datadir}/applications/mplayer.desktop -%{_datadir}/pixmaps/mplayer.xpm +%{_datadir}/pixmaps/mplayer.png %files doc %defattr(-, root, root)
[-] [+]	Added	MPlayer-x264_pkgconfig.patch ^
@@ -0,0 +1,12 @@ +--- configure.orig 2011-10-23 14:25:09.217000421 +0200 ++++ configure 2011-10-23 14:36:14.046000420 +0200 +@@ -6913,7 +6913,8 @@ + int main(void) { x264_encoder_open((void*)0); return 0; } + EOF + _x264=no +- for ld_x264 in "-lx264 $ld_pthread" "-lx264 $ld_pthread" ; do ++ extra_cflags="`pkg-config --cflags x264` $extra_cflags" ++ for ld_x264 in "`pkg-config --variable=libdir --static x264`/libx264.a" "`pkg-config --libs x264`" "-lx264 $ld_pthread" "-lx264 $ld_pthread" ; do + cc_check $ld_x264 && libs_mencoder="$libs_mencoder $ld_x264" && _x264=yes && break + done + fi
[-] [+]	Deleted	ffmpeg-fix_missing_return_in_non_void_function.patch ^
@@ -1,19 +0,0 @@ ---- libswscale/x86/yuv2rgb_template.c.orig 2011-04-11 23:00:32.000000000 +0200 -+++ libswscale/x86/yuv2rgb_template.c 2011-04-11 23:01:28.000000000 +0200 -@@ -406,6 +406,8 @@ - YUV2RGB_ENDLOOP(4) - YUV2RGB_OPERANDS_ALPHA - YUV2RGB_ENDFUNC -+#else -+ return srcSliceH; - #endif - } - -@@ -449,5 +451,7 @@ - YUV2RGB_ENDLOOP(4) - YUV2RGB_OPERANDS_ALPHA - YUV2RGB_ENDFUNC -+#else -+ return srcSliceH; - #endif - }
[-] [+]	Added	ffmpeg-fix_sequence-point.patch ^
@@ -0,0 +1,12 @@ +--- libavcodec/j2kenc.c.orig 2011-10-23 16:00:45.868000419 +0200 ++++ libavcodec/j2kenc.c 2011-10-23 19:34:30.966000421 +0200 +@@ -869,7 +869,8 @@ + int ptr = t1.data[y-yy0]; + for (x = xx0; x < xx1; x++){ + ptr = (comp->data[(comp->coord[0][1] - comp->coord[0][0]) * y + x]); +- ptr++ = (int64_t)ptr * (int64_t)(8192 * 8192 / band->stepsize) >> 13 - NMSEDEC_FRACBITS; ++ ptr = (int64_t)ptr * (int64_t)(8192 * 8192 / band->stepsize) >> 13 - NMSEDEC_FRACBITS; ++ ptr++; + } + } + }
	Changed	MPlayer-1.0rc4_r34277.tar.bz2 ^
[-] [+]	Changed	MPlayer-rpmlintrc ^
@@ -5,3 +5,5 @@ addFilter("no-rpm-opt-flags") +setBadness('sequence-point', 0) +
	Added	ffmpeg-49aa397414eb4dbe5da292fcdb8a6084f71ae949.tar.bz2 ^
	Deleted	ffmpeg-c104a6e90226eaa253aeba471c8859e0da922da7.tar.bz2 ^
	Added	x264-snapshot-20111029-2245.tar.bz2 ^