Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	transcode.spec
@@ -7,6 +7,7 @@ Source0: transcode-1.0.5.tar.bz2 Patch0: transcode-lzo2.01.patch +Patch1: transcode_opensuse11.diff BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} Summary: a linux video stream processing utility @@ -25,7 +26,6 @@ %else BuildRequires: lzo-devel < 2 %endif -BuildRequires: libffmpeg0-devel >= 0.4.9 BuildRequires: nasm >= 0.98.35 BuildRequires: gtk-devel BuildRequires: libdvdread-devel @@ -38,7 +38,7 @@ BuildRequires: libfame-devel BuildRequires: aalib-devel BuildRequires: ImageMagick-devel -BuildRequires: a52dec +BuildRequires: liba52dec-devel BuildRequires: freetype2-devel BuildRequires: pvm-devel BuildRequires: mjpegtools @@ -82,6 +82,9 @@ %if 0%{?suse_version} >= 1000 %patch0 -p1 %endif +%if 0%{?suse_version} > 1030 +%patch1 -p1 +%endif %build @@ -104,17 +107,21 @@ --enable-avifile --with-avifile-includes=%_includedir/avifile-0.7 \ %endif --enable-libxml2 \ - --enable-mjpegtools --enable-sdl --enable-gtk --enable-libfame --enable-imagemagick --enable-ffbin \ + --enable-mjpegtools --enable-sdl --enable-gtk --enable-libfame --enable-ffbin \ +%if 0%{?suse_version} <= 1030 + --enable-imagemagick \ +%else + --disable-imagemagick \ +%endif %ifarch x86_64 amd64 ia32e - --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUX64 \ + --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUX64 %else %ifarch ppc - --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXPPC \ + --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXPPC %else - --enable-pvm3 --with-pvm3-libs=%{_libdir}/pvm3/lib/LINUX \ + --enable-pvm3 --with-pvm3-libs=%{_libdir}/pvm3/lib/LINUX %endif %endif -\|\| cat config.log %{__make} %{?jobs:-j%{jobs}} @@ -160,301 +167,13 @@ %{_libdir}/%{name}/a52_decore.so %{_libdir}/%{name}/af6_decore.la %{_libdir}/%{name}/af6_decore.so -%{_libdir}/%{name}/export_mp2.la -%{_libdir}/%{name}/export_mp2.so -%{_libdir}/%{name}/export_pvn.la -%{_libdir}/%{name}/export_pvn.so -%{_libdir}/%{name}/export_ac3.la -%{_libdir}/%{name}/export_ac3.so -%if 0%{?suse_version} < 1000 -%{_libdir}/%{name}/export_af6.conf -%{_libdir}/%{name}/export_af6.la -%{_libdir}/%{name}/export_af6.so -%endif -%{_libdir}/%{name}/export_debugppm.la -%{_libdir}/%{name}/export_debugppm.so -%{_libdir}/%{name}/export_divx4.la -%{_libdir}/%{name}/export_divx4.so -%{_libdir}/%{name}/export_divx4raw.la -%{_libdir}/%{name}/export_divx4raw.so -%{_libdir}/%{name}/export_divx5.la -%{_libdir}/%{name}/export_divx5.so -%{_libdir}/%{name}/export_divx5raw.la -%{_libdir}/%{name}/export_divx5raw.so -%{_libdir}/%{name}/export_dv.la -%{_libdir}/%{name}/export_dv.so -%{_libdir}/%{name}/export_dvraw.la -%{_libdir}/%{name}/export_dvraw.so -%{_libdir}/%{name}/export_fame.la -%{_libdir}/%{name}/export_fame.so -%{_libdir}/%{name}/export_ffmpeg.la -%{_libdir}/%{name}/export_ffmpeg.so -%{_libdir}/%{name}/export_im.la -%{_libdir}/%{name}/export_im.so -%{_libdir}/%{name}/export_jpg.la -%{_libdir}/%{name}/export_jpg.so -%{_libdir}/%{name}/export_lame.la -%{_libdir}/%{name}/export_lame.so -%{_libdir}/%{name}/export_lzo.la -%{_libdir}/%{name}/export_lzo.so -%{_libdir}/%{name}/export_mjpeg.la -%{_libdir}/%{name}/export_mjpeg.so -%if 0%{?suse_version} >= 1020 -%{_libdir}/%{name}/export_mov.la -%{_libdir}/%{name}/export_mov.so -%endif -%{_libdir}/%{name}/export_mp1e.la -%{_libdir}/%{name}/export_mp1e.so -%{_libdir}/%{name}/export_mp2enc.la -%{_libdir}/%{name}/export_mp2enc.so -#%ifnarch x86_64 amd64 ia32e -#%{_libdir}/%{name}/export_mpeg.la -#%{_libdir}/%{name}/export_mpeg.so -#%endif -%{_libdir}/%{name}/export_mpeg2enc.la -%{_libdir}/%{name}/export_mpeg2enc.so -%{_libdir}/%{name}/export_net.la -%{_libdir}/%{name}/export_net.so -%{_libdir}/%{name}/export_null.la -%{_libdir}/%{name}/export_null.so -%{_libdir}/%{name}/export_ogg.la -%{_libdir}/%{name}/export_ogg.so -%{_libdir}/%{name}/export_pcm.la -%{_libdir}/%{name}/export_pcm.so -%{_libdir}/%{name}/export_ppm.la -%{_libdir}/%{name}/export_ppm.so -%{_libdir}/%{name}/export_pvm.la -%{_libdir}/%{name}/export_pvm.so -%{_libdir}/%{name}/export_raw.la -%{_libdir}/%{name}/export_raw.so -%{_libdir}/%{name}/export_toolame.la -%{_libdir}/%{name}/export_toolame.so -%{_libdir}/%{name}/export_wav.la -%{_libdir}/%{name}/export_wav.so -%{_libdir}/%{name}/export_xvid.so -%{_libdir}/%{name}/export_xvid2.la -%{_libdir}/%{name}/export_xvid2.so -%{_libdir}/%{name}/export_xvid3.la -%{_libdir}/%{name}/export_xvid3.so -%{_libdir}/%{name}/export_xvid4.la -%{_libdir}/%{name}/export_xvid4.so -%{_libdir}/%{name}/export_yuv4mpeg.la -%{_libdir}/%{name}/export_yuv4mpeg.so -%{_libdir}/%{name}/filter_fieldanalysis.la -%{_libdir}/%{name}/filter_fieldanalysis.so -%{_libdir}/%{name}/filter_levels.la -%{_libdir}/%{name}/filter_levels.so -%ifarch i386 i486 i586 i686 -%{_libdir}/%{name}/filter_tomsmocomp.la -%{_libdir}/%{name}/filter_tomsmocomp.so -%endif -%{_libdir}/%{name}/filter_29to23.la -%{_libdir}/%{name}/filter_29to23.so -%{_libdir}/%{name}/filter_32detect.la -%{_libdir}/%{name}/filter_32detect.so -%{_libdir}/%{name}/filter_32drop.la -%{_libdir}/%{name}/filter_32drop.so -%{_libdir}/%{name}/filter_aclip.la -%{_libdir}/%{name}/filter_aclip.so -%{_libdir}/%{name}/filter_ascii.la -%{_libdir}/%{name}/filter_ascii.so -%{_libdir}/%{name}/filter_astat.la -%{_libdir}/%{name}/filter_astat.so -%{_libdir}/%{name}/filter_clone.la -%{_libdir}/%{name}/filter_clone.so -%{_libdir}/%{name}/filter_compare.la -%{_libdir}/%{name}/filter_compare.so -%{_libdir}/%{name}/filter_control.la -%{_libdir}/%{name}/filter_control.so -%{_libdir}/%{name}/filter_cpaudio.la -%{_libdir}/%{name}/filter_cpaudio.so -%{_libdir}/%{name}/filter_cshift.la -%{_libdir}/%{name}/filter_cshift.so -%{_libdir}/%{name}/filter_cut.la -%{_libdir}/%{name}/filter_cut.so -%{_libdir}/%{name}/filter_decimate.la -%{_libdir}/%{name}/filter_decimate.so -%{_libdir}/%{name}/filter_denoise3d.la -%{_libdir}/%{name}/filter_denoise3d.so -%{_libdir}/%{name}/filter_detectclipping.la -%{_libdir}/%{name}/filter_detectclipping.so -%{_libdir}/%{name}/filter_detectsilence.la -%{_libdir}/%{name}/filter_detectsilence.so -%ifnarch ppc -%{_libdir}/%{name}/filter_dilyuvmmx.la -%{_libdir}/%{name}/filter_dilyuvmmx.so -%endif -%{_libdir}/%{name}/filter_divxkey.la -%{_libdir}/%{name}/filter_divxkey.so -%{_libdir}/%{name}/filter_dnr.la -%{_libdir}/%{name}/filter_dnr.so -%{_libdir}/%{name}/filter_doublefps.la -%{_libdir}/%{name}/filter_doublefps.so -%{_libdir}/%{name}/filter_extsub.la -%{_libdir}/%{name}/filter_extsub.so -%{_libdir}/%{name}/filter_extsub2.la -%{_libdir}/%{name}/filter_extsub2.so x 1 @@ -7,6 +7,7 @@ 2 Source0: transcode-1.0.5.tar.bz2 3 4 Patch0: transcode-lzo2.01.patch 5 +Patch1: transcode_opensuse11.diff 6 BuildRoot: %{_tmppath}/buildroot-%{name}-%{version} 7 8 Summary: a linux video stream processing utility 9 @@ -25,7 +26,6 @@ 10 %else 11 BuildRequires: lzo-devel < 2 12 %endif 13 -BuildRequires: libffmpeg0-devel >= 0.4.9 14 BuildRequires: nasm >= 0.98.35 15 BuildRequires: gtk-devel 16 BuildRequires: libdvdread-devel 17 @@ -38,7 +38,7 @@ 18 BuildRequires: libfame-devel 19 BuildRequires: aalib-devel 20 BuildRequires: ImageMagick-devel 21 -BuildRequires: a52dec 22 +BuildRequires: liba52dec-devel 23 BuildRequires: freetype2-devel 24 BuildRequires: pvm-devel 25 BuildRequires: mjpegtools 26 @@ -82,6 +82,9 @@ 27 %if 0%{?suse_version} >= 1000 28 %patch0 -p1 29 %endif 30 +%if 0%{?suse_version} > 1030 31 +%patch1 -p1 32 +%endif 33 34 35 %build 36 @@ -104,17 +107,21 @@ 37 --enable-avifile --with-avifile-includes=%_includedir/avifile-0.7 \ 38 %endif 39 --enable-libxml2 \ 40 - --enable-mjpegtools --enable-sdl --enable-gtk --enable-libfame --enable-imagemagick --enable-ffbin \ 41 + --enable-mjpegtools --enable-sdl --enable-gtk --enable-libfame --enable-ffbin \ 42 +%if 0%{?suse_version} <= 1030 43 + --enable-imagemagick \ 44 +%else 45 + --disable-imagemagick \ 46 +%endif 47 %ifarch x86_64 amd64 ia32e 48 - --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUX64 \ 49 + --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUX64 50 %else 51 %ifarch ppc 52 - --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXPPC \ 53 + --enable-pvm3 --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXPPC 54 %else 55 - --enable-pvm3 --with-pvm3-libs=%{_libdir}/pvm3/lib/LINUX \ 56 + --enable-pvm3 --with-pvm3-libs=%{_libdir}/pvm3/lib/LINUX 57 %endif 58 %endif 59 -\|\| cat config.log 60 61 %{__make} %{?jobs:-j%{jobs}} 62 63 @@ -160,301 +167,13 @@ 64 %{_libdir}/%{name}/a52_decore.so 65 %{_libdir}/%{name}/af6_decore.la 66 %{_libdir}/%{name}/af6_decore.so 67 -%{_libdir}/%{name}/export_mp2.la 68 -%{_libdir}/%{name}/export_mp2.so 69 -%{_libdir}/%{name}/export_pvn.la 70 -%{_libdir}/%{name}/export_pvn.so 71 -%{_libdir}/%{name}/export_ac3.la 72 -%{_libdir}/%{name}/export_ac3.so 73 -%if 0%{?suse_version} < 1000 74 -%{_libdir}/%{name}/export_af6.conf 75 -%{_libdir}/%{name}/export_af6.la 76 -%{_libdir}/%{name}/export_af6.so 77 -%endif 78 -%{_libdir}/%{name}/export_debugppm.la 79 -%{_libdir}/%{name}/export_debugppm.so 80 -%{_libdir}/%{name}/export_divx4.la 81 -%{_libdir}/%{name}/export_divx4.so 82 -%{_libdir}/%{name}/export_divx4raw.la 83 -%{_libdir}/%{name}/export_divx4raw.so 84 -%{_libdir}/%{name}/export_divx5.la 85 -%{_libdir}/%{name}/export_divx5.so 86 -%{_libdir}/%{name}/export_divx5raw.la 87 -%{_libdir}/%{name}/export_divx5raw.so 88 -%{_libdir}/%{name}/export_dv.la 89 -%{_libdir}/%{name}/export_dv.so 90 -%{_libdir}/%{name}/export_dvraw.la 91 -%{_libdir}/%{name}/export_dvraw.so 92 -%{_libdir}/%{name}/export_fame.la 93 -%{_libdir}/%{name}/export_fame.so 94 -%{_libdir}/%{name}/export_ffmpeg.la 95 -%{_libdir}/%{name}/export_ffmpeg.so 96 -%{_libdir}/%{name}/export_im.la 97 -%{_libdir}/%{name}/export_im.so 98 -%{_libdir}/%{name}/export_jpg.la 99 -%{_libdir}/%{name}/export_jpg.so 100 -%{_libdir}/%{name}/export_lame.la 101 -%{_libdir}/%{name}/export_lame.so 102 -%{_libdir}/%{name}/export_lzo.la 103 -%{_libdir}/%{name}/export_lzo.so 104 -%{_libdir}/%{name}/export_mjpeg.la 105 -%{_libdir}/%{name}/export_mjpeg.so 106 -%if 0%{?suse_version} >= 1020 107 -%{_libdir}/%{name}/export_mov.la 108 -%{_libdir}/%{name}/export_mov.so 109 -%endif 110 -%{_libdir}/%{name}/export_mp1e.la 111 -%{_libdir}/%{name}/export_mp1e.so 112 -%{_libdir}/%{name}/export_mp2enc.la 113 -%{_libdir}/%{name}/export_mp2enc.so 114 -#%ifnarch x86_64 amd64 ia32e 115 -#%{_libdir}/%{name}/export_mpeg.la 116 -#%{_libdir}/%{name}/export_mpeg.so 117 -#%endif 118 -%{_libdir}/%{name}/export_mpeg2enc.la 119 -%{_libdir}/%{name}/export_mpeg2enc.so 120 -%{_libdir}/%{name}/export_net.la 121 -%{_libdir}/%{name}/export_net.so 122 -%{_libdir}/%{name}/export_null.la 123 -%{_libdir}/%{name}/export_null.so 124 -%{_libdir}/%{name}/export_ogg.la 125 -%{_libdir}/%{name}/export_ogg.so 126 -%{_libdir}/%{name}/export_pcm.la 127 -%{_libdir}/%{name}/export_pcm.so 128 -%{_libdir}/%{name}/export_ppm.la 129 -%{_libdir}/%{name}/export_ppm.so 130 -%{_libdir}/%{name}/export_pvm.la 131 -%{_libdir}/%{name}/export_pvm.so 132 -%{_libdir}/%{name}/export_raw.la 133 -%{_libdir}/%{name}/export_raw.so 134 -%{_libdir}/%{name}/export_toolame.la 135 -%{_libdir}/%{name}/export_toolame.so 136 -%{_libdir}/%{name}/export_wav.la 137 -%{_libdir}/%{name}/export_wav.so 138 -%{_libdir}/%{name}/export_xvid.so 139 -%{_libdir}/%{name}/export_xvid2.la 140 -%{_libdir}/%{name}/export_xvid2.so 141 -%{_libdir}/%{name}/export_xvid3.la 142 -%{_libdir}/%{name}/export_xvid3.so 143 -%{_libdir}/%{name}/export_xvid4.la 144 -%{_libdir}/%{name}/export_xvid4.so 145 -%{_libdir}/%{name}/export_yuv4mpeg.la 146 -%{_libdir}/%{name}/export_yuv4mpeg.so 147 -%{_libdir}/%{name}/filter_fieldanalysis.la 148 -%{_libdir}/%{name}/filter_fieldanalysis.so 149 -%{_libdir}/%{name}/filter_levels.la 150 -%{_libdir}/%{name}/filter_levels.so 151 -%ifarch i386 i486 i586 i686 152 -%{_libdir}/%{name}/filter_tomsmocomp.la 153 -%{_libdir}/%{name}/filter_tomsmocomp.so 154 -%endif 155 -%{_libdir}/%{name}/filter_29to23.la 156 -%{_libdir}/%{name}/filter_29to23.so 157 -%{_libdir}/%{name}/filter_32detect.la 158 -%{_libdir}/%{name}/filter_32detect.so 159 -%{_libdir}/%{name}/filter_32drop.la 160 -%{_libdir}/%{name}/filter_32drop.so 161 -%{_libdir}/%{name}/filter_aclip.la 162 -%{_libdir}/%{name}/filter_aclip.so 163 -%{_libdir}/%{name}/filter_ascii.la 164 -%{_libdir}/%{name}/filter_ascii.so 165 -%{_libdir}/%{name}/filter_astat.la 166 -%{_libdir}/%{name}/filter_astat.so 167 -%{_libdir}/%{name}/filter_clone.la 168 -%{_libdir}/%{name}/filter_clone.so 169 -%{_libdir}/%{name}/filter_compare.la 170 -%{_libdir}/%{name}/filter_compare.so 171 -%{_libdir}/%{name}/filter_control.la 172 -%{_libdir}/%{name}/filter_control.so 173 -%{_libdir}/%{name}/filter_cpaudio.la 174 -%{_libdir}/%{name}/filter_cpaudio.so 175 -%{_libdir}/%{name}/filter_cshift.la 176 -%{_libdir}/%{name}/filter_cshift.so 177 -%{_libdir}/%{name}/filter_cut.la 178 -%{_libdir}/%{name}/filter_cut.so 179 -%{_libdir}/%{name}/filter_decimate.la 180 -%{_libdir}/%{name}/filter_decimate.so 181 -%{_libdir}/%{name}/filter_denoise3d.la 182 -%{_libdir}/%{name}/filter_denoise3d.so 183 -%{_libdir}/%{name}/filter_detectclipping.la 184 -%{_libdir}/%{name}/filter_detectclipping.so 185 -%{_libdir}/%{name}/filter_detectsilence.la 186 -%{_libdir}/%{name}/filter_detectsilence.so 187 -%ifnarch ppc 188 -%{_libdir}/%{name}/filter_dilyuvmmx.la 189 -%{_libdir}/%{name}/filter_dilyuvmmx.so 190 -%endif 191 -%{_libdir}/%{name}/filter_divxkey.la 192 -%{_libdir}/%{name}/filter_divxkey.so 193 -%{_libdir}/%{name}/filter_dnr.la 194 -%{_libdir}/%{name}/filter_dnr.so 195 -%{_libdir}/%{name}/filter_doublefps.la 196 -%{_libdir}/%{name}/filter_doublefps.so 197 -%{_libdir}/%{name}/filter_extsub.la 198 -%{_libdir}/%{name}/filter_extsub.so 199 -%{_libdir}/%{name}/filter_extsub2.la 200 -%{_libdir}/%{name}/filter_extsub2.so 201
[-] [+]	Added	transcode_opensuse11.diff ^
@@ -0,0 +1,33 @@ +diff -ur transcode-1.0.5.orig/import/nuv/rtjpeg_aud_plugin.c transcode-1.0.5/import/nuv/rtjpeg_aud_plugin.c +--- transcode-1.0.5.orig/import/nuv/rtjpeg_aud_plugin.c 2004-12-19 08:57:08.000000000 +0100 ++++ transcode-1.0.5/import/nuv/rtjpeg_aud_plugin.c 2008-04-26 18:04:11.000000000 +0200 +@@ -48,6 +48,8 @@ + #include "rtjpeg_aud_plugin.h" + #undef RTJPEG_INTERNAL + ++#include "transcode.h" ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -58,8 +60,6 @@ + #endif + #include "minilzo.h" + +-#include "transcode.h" +- + + /* + int rtjpeg_aud_file; +diff -ur transcode-1.0.5.orig/import/nuv/RTjpegN.h transcode-1.0.5/import/nuv/RTjpegN.h +--- transcode-1.0.5.orig/import/nuv/RTjpegN.h 2003-03-08 14:42:48.000000000 +0100 ++++ transcode-1.0.5/import/nuv/RTjpegN.h 2008-04-26 17:44:55.000000000 +0200 +@@ -22,7 +22,7 @@ + + */ + +-#ifndef _I386_TYPES_H ++#ifndef _ASM_X86_TYPES_H + typedef unsigned char __u8; + typedef unsigned short __u16; + typedef unsigned long __u32;