Hello community, here is the log from the commit of package mjpegtools checked in at Fri Aug 10 17:12:24 CEST 2007. -------- --- mjpegtools/mjpegtools.changes 2007-08-05 14:04:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/mjpegtools/mjpegtools.changes 2007-08-10 14:08:08.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 10 14:05:13 CEST 2007 - pcerny@suse.cz + +- fixed dependency problems on ppc/ppc64 [#297568] + (reenabling architecture dependent configure options) +- changed DISTRIBUTABLE to BUILD_ORIG +- patch for jpeg2yuv to detect EOF correctly (from upstream) +- patch names synchronization + +------------------------------------------------------------------- Old: ---- mjpegtools-1.9.0rc2.tar.gz mjpegtools.getopt.patch mjpegtools.vector_alignment.patch mjpegtools.writeable-strings.patch New: ---- mjpegtools-1.9.0rc2.tar.bz2 mjpegtools-codecpatch.patch mjpegtools-codecpatch.sh mjpegtools-getopt.patch mjpegtools-jpeg2yuv_stdin.patch mjpegtools-vector_alignment.patch mjpegtools-writeable_strings.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.U17465/_old 2007-08-10 17:11:33.000000000 +0200 +++ /var/tmp/diff_new_pack.U17465/_new 2007-08-10 17:11:33.000000000 +0200 @@ -11,27 +11,35 @@ # norootforbuild Name: mjpegtools -BuildRequires: SDL-devel gcc-c++ gtk1-compat-devel libjpeg-devel libquicktime-devel nasm +BuildRequires: SDL-devel gcc-c++ libjpeg-devel libquicktime-devel nasm +#BuildRequires: gtk1-compat-devel #BuildRequires: libmovtar popt-devel URL: http://mjpeg.sourceforge.net/ -%define DISTRIBUTABLE 1 License: BSD 3-Clause, GPL v2 or later Group: Productivity/Multimedia/Video/Editors and Convertors PreReq: %install_info_prereq Autoreqprov: on Version: 1.9.0rc2 -Release: 32 +Release: 35 Summary: MJPEG Video Capture and Processing Tools -Source0: http://download.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz -NoSource: 0 +%if 0%{?BUILD_ORIG} +Source0: %{name}-%{version}.tar.bz2 +%else +# WARNING: This is not a comment, but a real command to repack souce: +#%(sh %{_sourcedir}/%{name}-codecpatch.sh %{_sourcedir} %{name}-%{version}.tar.bz2 %{name}-%{version}-patched.tar.bz2 ) +Source0: %{name}-%{version}-patched.tar.bz2 +%endif +Source1: mjpegtools-codecpatch.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: mjpegtools-cpuinfo.patch Patch1: mjpegtools-includes.patch Patch2: mjpegtools-motionestbug.patch Patch3: mjpegtools-strcmp.patch -Patch4: mjpegtools.vector_alignment.patch -Patch5: mjpegtools.getopt.patch -Patch6: mjpegtools.writeable-strings.patch +Patch4: mjpegtools-vector_alignment.patch +Patch5: mjpegtools-getopt.patch +Patch6: mjpegtools-writeable_strings.patch +Patch7: mjpegtools-jpeg2yuv_stdin.patch +Patch100: %{name}-codecpatch.patch %description The mjpegtools allow for capture, playback, processing, and simple @@ -53,9 +61,8 @@ %package devel Group: Productivity/Multimedia/Video/Editors and Convertors Summary: MJPEG Video Capture and Processing Tools -Requires: mjpegtools = %{version} -Requires: glibc-devel, libstdc++-devel, zlib-devel, libjpeg-devel -Requires: libquicktime-devel, libdv-devel +Requires: %{name} = %{version} +Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel libquicktime-devel %description devel The mjpegtools allow for capture, playback, processing, and simple @@ -83,30 +90,38 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p0 +%if ! 0%{?BUILD_ORIG} +# remove references to files removed by %{name}-codecpatch.sh +%patch100 -p1 +%endif # overwrite cpuinfo.sh, cpu optimization does not make sense # when building for a distribution echo "" > cpuinfo.sh %build +%if 0%{?BUILD_ORIG} sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc diff -u mpeg2enc/mpeg2enc.cc* || : -%{?suse_update_config:%{suse_update_config -f}} +%endif %ifarch %ix86 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %else export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" %endif export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -#autoreconf -vfi -./configure --prefix=%{_prefix} \ +autoreconf -vfi +# disable linking against libmpeg2encpp on ppc architectures +./configure \ +%ifarch ppc ppc64 + --disable-simd-accel \ +%endif + --prefix=%{_prefix} \ --libdir=%{_libdir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --disable-warnings_as_errors \ --disable-static -#ifarch ppc ppc64 -# --disable-simd-accel \ -#endif # --with-quicktime=/usr/include/quicktime \ # --with-dv=/usr \ %{__make} %{?jobs:-j%jobs} @@ -114,9 +129,8 @@ %install make DESTDIR=%{buildroot} install rm -f %{buildroot}/usr/share/info/dir -%if %DISTRIBUTABLE -# rm patent critical stuff (mpeg encoding) -rm -f %{buildroot}%{_libdir}/libmpeg2encpp* +# remove mpeg encoding +%if ! 0%{?BUILD_ORIG} for app in lav2mpeg mp2enc mpeg2enc mpegtranscode; do rm -f %{buildroot}%{_bindir}/${app} rm -f %{buildroot}%{_mandir}/man1/${app}.* @@ -151,6 +165,12 @@ %{_libdir}/pkgconfig/mjpegtools.pc %changelog +* Fri Aug 10 2007 - pcerny@suse.cz +- fixed dependency problems on ppc/ppc64 [#297568] + (reenabling architecture dependent configure options) +- changed DISTRIBUTABLE to BUILD_ORIG +- patch for jpeg2yuv to detect EOF correctly (from upstream) +- patch names synchronization * Sun Aug 05 2007 - olh@suse.de - getopt returns int, not char align vector buffers to 16 bytes ++++++ mjpegtools-codecpatch.patch ++++++ diff -rp mjpegtools-1.9.0rc2.orig/configure.ac mjpegtools-1.9.0rc2/configure.ac *** mjpegtools-1.9.0rc2.orig/configure.ac 2007-02-26 18:05:38.000000000 +0100 --- mjpegtools-1.9.0rc2/configure.ac 2007-08-09 17:40:30.241647704 +0200 *************** AC_CONFIG_FILES([ *** 559,566 **** y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile - mpeg2enc/Makefile - aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile --- 559,564 ---- diff -rp mjpegtools-1.9.0rc2.orig/Makefile.am mjpegtools-1.9.0rc2/Makefile.am *** mjpegtools-1.9.0rc2.orig/Makefile.am 2006-06-01 19:09:25.000000000 +0200 --- mjpegtools-1.9.0rc2/Makefile.am 2007-08-09 17:40:15.590874960 +0200 *************** *** 10,18 **** SUBDIRS = \ utils \ - mpeg2enc \ lavtools \ - aenc \ mplex \ scripts \ docs \ --- 10,16 ---- diff -rp mjpegtools-1.9.0rc2.orig/Makefile.in mjpegtools-1.9.0rc2/Makefile.in *** mjpegtools-1.9.0rc2.orig/Makefile.in 2007-03-04 16:11:53.000000000 +0100 --- mjpegtools-1.9.0rc2/Makefile.in 2007-08-09 17:40:03.788669168 +0200 *************** target_os = @target_os@ *** 259,267 **** target_vendor = @target_vendor@ SUBDIRS = \ utils \ - mpeg2enc \ lavtools \ - aenc \ mplex \ scripts \ docs \ --- 259,265 ---- ++++++ mjpegtools-getopt.patch ++++++ --- y4mdenoise/main.c | 2 +- yuvdeinterlace/yuvdeinterlace.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/y4mdenoise/main.c +++ b/y4mdenoise/main.c @@ -261,7 +261,7 @@ int main(int argc, char *argv[]) void process_commandline(int argc, char *argv[]) { - char c; + int c; while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:i:")) != -1) // HACK { --- a/yuvdeinterlace/yuvdeinterlace.cc +++ b/yuvdeinterlace/yuvdeinterlace.cc @@ -845,7 +845,7 @@ main (int argc, char *argv[]) deinterlacer YUVdeint; - char c; + int c; YUVdeint.field_order = -1; ++++++ mjpegtools-jpeg2yuv_stdin.patch ++++++ --- lavtools/jpeg2yuv.c 2007-01-27 12:17:40.000000000 +0100 +++ lavtools/jpeg2yuv_stdin_fixed.c 2007-08-08 19:32:51.000000000 +0200 @@ -462,13 +462,11 @@ jpegsize = read_jpeg_data(jpegdata, jpegname, prev_jpegname); } else { - jpegsize = 0; + jpegsize = -1; } } - mjpeg_info("Numframes %i jpegsize %i", param->numframes, jpegsize); if (jpegsize == -1) { - mjpeg_info("in jpegsize < 0"); if (param->numframes == -1) { mjpeg_info("No more frames. Stopping."); break; /* we are done; leave 'while' loop */ ++++++ mjpegtools-vector_alignment.patch ++++++ --- mpeg2enc/imageplanes.cc | 11 +++++++---- mpeg2enc/imageplanes.hh | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) --- a/mpeg2enc/imageplanes.cc +++ b/mpeg2enc/imageplanes.cc @@ -19,19 +19,22 @@ ImagePlanes::ImagePlanes( EncoderParams switch( c ) { case 0 : // Y plane - planes[c] = new uint8_t[encparams.lum_buffer_size]; + raw_planes[c] = new uint8_t[encparams.lum_buffer_size + 0x10]; + planes[c] = (uint8_t *)((((unsigned long)raw_planes[c]) + 0x10) & ~0xf); BorderMark( planes[c] , encparams.enc_width,encparams.enc_height, encparams.phy_width,encparams.phy_height); break; case 1 : // U plane case 2 : // V plane - planes[c] = new uint8_t[encparams.chrom_buffer_size]; + raw_planes[c] = new uint8_t[encparams.chrom_buffer_size + 0x10]; + planes[c] = (uint8_t *)((((unsigned long)raw_planes[c]) + 0x10) & ~0xf); BorderMark( planes[c], encparams.enc_chrom_width, encparams.enc_chrom_height, encparams.phy_chrom_width,encparams.phy_chrom_height); break; default : // TODO: shift Y subsampled data from appended in Y buffer to seperate planes + raw_planes[c] = 0; planes[c] = 0; break; } @@ -43,8 +46,8 @@ ImagePlanes::ImagePlanes( EncoderParams { for( int c = 0; c < NUM_PLANES; ++c ) { - if( planes[c] != 0 ) - delete [] planes[c]; + if( raw_planes[c] != 0 ) + delete [] raw_planes[c]; } } --- a/mpeg2enc/imageplanes.hh +++ b/mpeg2enc/imageplanes.hh @@ -51,6 +51,7 @@ class ImagePlanes int image_data_width, int image_data_height); protected: uint8_t *planes[NUM_PLANES]; + uint8_t *raw_planes[NUM_PLANES]; }; ++++++ mjpegtools-writeable_strings.patch ++++++ --- utils/motionsearch.c | 2 +- utils/motionsearch.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/utils/motionsearch.c +++ b/utils/motionsearch.c @@ -1021,7 +1021,7 @@ if (!strcmp(#x, name) && simd_name_ok( n p##x = x; \ } -void reset_motion_simd(char *name) +void reset_motion_simd(const char *name) { SIMD_RESET(sad_00); SIMD_RESET(sad_01); --- a/utils/motionsearch.h +++ b/utils/motionsearch.h @@ -142,7 +142,7 @@ extern "C" { #endif void init_motion_search(void); -void reset_motion_simd(char *); +void reset_motion_simd(const char *); int round_search_radius( int radius ); #ifdef __cplusplus ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org