1.1 --- a/x264/x264.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/x264/x264.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,42 +1,29 @@
1.4 -%global snapshot 20100706
1.5 -%global git d058f37
1.6 -
1.7 -Summary: H264/AVC video streams encoder
1.8 -Name: x264
1.9 -Version: 0.0.0
1.10 -Release: 0.28.%{snapshot}git%{git}%{?dist}
1.11 -License: GPLv2+
1.12 -Group: System Environment/Libraries
1.13 -URL: http://developers.videolan.org/x264.html
1.14 -Source0: %{name}-%{snapshot}.tar.bz2
1.15 -Source1: x264-snapshot.sh
1.16 -# don't remove config.h and don't re-run version.sh
1.17 -Patch0: x264-nover.patch
1.18 -# link with shared libx264
1.19 -Patch1: x264-shared.patch
1.20 -# don't strip if configured with --enable-debug
1.21 -Patch2: x264-nostrip.patch
1.22 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
1.23 -%{!?_without_gpac:BuildRequires: gpac-devel-static}
1.24 -%{?_with_visualize:BuildRequires: libX11-devel}
1.25 -%ifarch x86_64 i686
1.26 +Name: x264
1.27 +Summary: H264/AVC video streams encoder
1.28 +Vendor: Europalab Software
1.29 +Packager: Michael Schloh von Bennewitz
1.30 +Distribution: MeeGo Thirdparty
1.31 +Version: 20101210
1.32 +Release: 20101210
1.33 +License: GPLv2+
1.34 +Group: System Environment/Libraries
1.35 +URL: http://developers.videolan.org/x264.html
1.36 +Source0: %{name}-%{version}.tar.bz2
1.37 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.38 +Requires: %{name}-libs = %{version}-%{release}
1.39 BuildRequires: yasm
1.40 -%endif
1.41 -Requires: %{name}-libs = %{version}-%{release}
1.42
1.43 %description
1.44 -x264 is a free library for encoding H264/AVC video streams, written from
1.45 -scratch.
1.46 -
1.47 -This package contains the frontend.
1.48 +x264 is a free library for encoding H264/AVC video streams.
1.49 +This package contains the frontend application.
1.50
1.51 %package libs
1.52 Summary: Library for encoding H264/AVC video streams
1.53 Group: Development/Libraries
1.54
1.55 %description libs
1.56 -x264 is a free library for encoding H264/AVC video streams, written from
1.57 -scratch.
1.58 +x264 is a free library for encoding H264/AVC video streams.
1.59 +This package contains runtime libraries.
1.60
1.61 %package devel
1.62 Summary: Development files for the x264 library
1.63 @@ -45,54 +32,34 @@
1.64 Requires: pkgconfig
1.65
1.66 %description devel
1.67 -x264 is a free library for encoding H264/AVC video streams, written from
1.68 -scratch.
1.69 -
1.70 +x264 is a free library for encoding H264/AVC video streams.
1.71 This package contains the development files.
1.72
1.73 -%define x_configure \
1.74 -./configure \\\
1.75 - --prefix=%{_prefix} \\\
1.76 - --exec-prefix=%{_exec_prefix} \\\
1.77 - --bindir=%{_bindir} \\\
1.78 - --includedir=%{_includedir} \\\
1.79 - --extra-cflags="$RPM_OPT_FLAGS" \\\
1.80 - %{!?_without_gpac:--enable-mp4-output} \\\
1.81 - %{?_with_visualize:--enable-visualize} \\\
1.82 - --enable-pthread \\\
1.83 - --enable-debug \\\
1.84 - --enable-shared \\\
1.85 - --enable-pic
1.86 -
1.87 -
1.88 %prep
1.89 -%setup -q -n %{name}-%{snapshot}
1.90 -%patch0 -p1 -b .nover
1.91 -%patch1 -p1 -b .shared
1.92 -%patch2 -p1 -b .nostrip
1.93 -# AUTHORS file is in iso-8859-1
1.94 -iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
1.95 -mv -f AUTHORS.utf8 AUTHORS
1.96 +%setup -q -n %{name}-%{version}
1.97 %ifarch i686
1.98 mkdir simd
1.99 cp -a `ls -1|grep -v simd` simd/
1.100 %endif
1.101 +%{__sed} -i \
1.102 + -e 's;\(\./version.sh\);# Dont run this: \1;g' \
1.103 + configure
1.104
1.105 %build
1.106 -%{x_configure}\
1.107 - --host=%{_target_platform} \
1.108 - --libdir=%{_libdir} \
1.109 +%configure \
1.110 + --enable-shared \
1.111 + --host=%{_target_platform} \
1.112 %ifarch i686
1.113 - --disable-asm \
1.114 + --disable-asm \
1.115 %endif
1.116 -
1.117 + --enable-visualize
1.118 +echo '#define X264_VERSION "r1820 fdcf2ae"' >>config.h
1.119 +echo '#define X264_POINTVER "0.110.1820 fdcf2ae"' >>config.h
1.120 %{__make} %{?_smp_mflags}
1.121 %ifarch i686
1.122 pushd simd
1.123 -%{x_configure}\
1.124 - --host=%{_target_platform} \
1.125 - --libdir=%{_libdir}/sse2 \
1.126 -
1.127 +%configure \
1.128 + --host=%{_target_platform}
1.129 %{__make} %{?_smp_mflags}
1.130 popd
1.131 %endif
1.132 @@ -100,12 +67,6 @@
1.133 %install
1.134 %{__rm} -rf %{buildroot}
1.135 %{__make} DESTDIR=%{buildroot} install
1.136 -%ifarch i686
1.137 -pushd simd
1.138 -%{__make} DESTDIR=%{buildroot} install
1.139 -rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc
1.140 -popd
1.141 -%endif
1.142
1.143 %clean
1.144 %{__rm} -rf %{buildroot}
1.145 @@ -132,6 +93,8 @@
1.146 %defattr(644, root, root, 0755)
1.147 %doc doc/*
1.148 %{_includedir}/x264.h
1.149 +%{_includedir}/x264_config.h
1.150 +%{_libdir}/libx264.a
1.151 %{_libdir}/libx264.so
1.152 %{_libdir}/pkgconfig/%{name}.pc
1.153 %ifarch i686
1.154 @@ -139,5 +102,8 @@
1.155 %endif
1.156
1.157 %changelog
1.158 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 4.1.3-20101201
1.159 +- Adjust packaging and patch logic
1.160 +
1.161 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> 0.0.0-0.28.20100706gitd058f37
1.162 -- Build for MeeGo
1.163 +- Build for MeeGo 1.1
