November 2013 - openSUSE Commits - openSUSE Mailing Lists

commit libavutil for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '13

29 Nov '13

Hello community, here is the log from the commit of package libavutil for openSUSE:Factory checked in at 2013-11-29 07:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libavutil (Old) and /work/SRC/openSUSE:Factory/.libavutil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libavutil" Changes: -------- --- /work/SRC/openSUSE:Factory/libavutil/libavutil.changes 2013-11-17 20:19:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libavutil.new/libavutil.changes 2013-11-29 07:01:37.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 20 00:00:00 UTC 2013 - Manfred.Tremmel(a)iiv.de + +- update to 2.1.1 + * bugfix release + +------------------------------------------------------------------- Old: ---- ffmpeg-2.1-crippled.tar.bz2 libavutil-2.1-cripple.patch New: ---- ffmpeg-2.1.1-crippled.tar.bz2 libavutil-2.1.1-cripple.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libavutil.spec ++++++ --- /var/tmp/diff_new_pack.2KARkB/_old 2013-11-29 07:01:38.000000000 +0100 +++ /var/tmp/diff_new_pack.2KARkB/_new 2013-11-29 07:01:38.000000000 +0100 @@ -20,7 +20,7 @@ %define swscale 2 Name: libavutil -Version: 2.1 +Version: 2.1.1 Release: 0 Summary: Utilities library from ffmpeg License: LGPL-3.0+ ++++++ ffmpeg-2.1-crippled.tar.bz2 -> ffmpeg-2.1.1-crippled.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/RELEASE new/ffmpeg-2.1.1/RELEASE --- old/ffmpeg-2.1/RELEASE 2013-10-28 01:58:04.000000000 +0100 +++ new/ffmpeg-2.1.1/RELEASE 2013-11-20 03:29:07.000000000 +0100 @@ -1 +1 @@ -2.1 +2.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/VERSION new/ffmpeg-2.1.1/VERSION --- old/ffmpeg-2.1/VERSION 2013-10-28 01:58:04.000000000 +0100 +++ new/ffmpeg-2.1.1/VERSION 2013-11-20 03:29:07.000000000 +0100 @@ -1 +1 @@ -2.1 +2.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/configure new/ffmpeg-2.1.1/configure --- old/ffmpeg-2.1/configure 2013-10-28 01:58:04.000000000 +0100 +++ new/ffmpeg-2.1.1/configure 2013-11-20 03:29:07.000000000 +0100 @@ -2878,7 +2878,9 @@ unset _depflags _DEPCMD _DEPFLAGS _flags_filter=echo - if $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then + if $_cc --version 2>&1 | grep -q '^GNU assembler'; then + true # no-op to avoid reading stdin in following checks + elif $_cc -v 2>&1 | grep -q '^gcc.*LLVM'; then _type=llvm_gcc gcc_extra_ver=$(expr "$($_cc --version | head -n1)" : '.*$(.*)$') _ident="llvm-gcc $($_cc -dumpversion) $gcc_extra_ver" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/doc/Doxyfile new/ffmpeg-2.1.1/doc/Doxyfile --- old/ffmpeg-2.1/doc/Doxyfile 2013-10-28 01:58:04.000000000 +0100 +++ new/ffmpeg-2.1.1/doc/Doxyfile 2013-11-20 03:29:07.000000000 +0100 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.1 +PROJECT_NUMBER = 2.1.1 # With the PROJECT_LOGO tag one can specify a logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/doc/filters.texi new/ffmpeg-2.1.1/doc/filters.texi --- old/ffmpeg-2.1/doc/filters.texi 2013-10-28 01:58:04.000000000 +0100 +++ new/ffmpeg-2.1.1/doc/filters.texi 2013-11-20 03:29:07.000000000 +0100 @@ -6422,9 +6422,11 @@ load and make pullup usable in realtime on slow machines. @end table -For example to inverse telecined NTSC input: +For best results (without duplicated frames in the output file) it is +necessary to change the output frame rate. For example, to inverse +telecine NTSC input: @example -pullup,fps=24000/1001 +ffmpeg -i input -vf pullup -r 24000/1001 ... @end example @section removelogo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/Makefile new/ffmpeg-2.1.1/libavutil/Makefile --- old/ffmpeg-2.1/libavutil/Makefile 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/Makefile 2013-11-20 03:29:07.000000000 +0100 @@ -90,7 +90,8 @@ intfloat_readwrite.o \ intmath.o \ lfg.o \ - lls.o \ + lls1.o \ + lls2.o \ log.o \ log2_tab.o \ mathematics.o \ @@ -143,7 +144,8 @@ fifo \ hmac \ lfg \ - lls \ + lls1 \ + lls2 \ md5 \ murmur3 \ opt \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls.c new/ffmpeg-2.1.1/libavutil/lls.c --- old/ffmpeg-2.1/libavutil/lls.c 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,179 +0,0 @@ -/* - * linear least squares model - * - * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * linear least squares model - */ - -#include <math.h> -#include <string.h> - -#include "attributes.h" -#include "version.h" -#include "lls.h" - -static void update_lls(LLSModel *m, double *var) -{ - int i, j; - - for (i = 0; i <= m->indep_count; i++) { - for (j = i; j <= m->indep_count; j++) { - m->covariance[i][j] += var[i] * var[j]; - } - } -} - -void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order) -{ - int i, j, k; - double (*factor)[MAX_VARS_ALIGN] = (void *) &m->covariance[1][0]; - double (*covar) [MAX_VARS_ALIGN] = (void *) &m->covariance[1][1]; - double *covar_y = m->covariance[0]; - int count = m->indep_count; - - for (i = 0; i < count; i++) { - for (j = i; j < count; j++) { - double sum = covar[i][j]; - - for (k = i - 1; k >= 0; k--) - sum -= factor[i][k] * factor[j][k]; - - if (i == j) { - if (sum < threshold) - sum = 1.0; - factor[i][i] = sqrt(sum); - } else { - factor[j][i] = sum / factor[i][i]; - } - } - } - - for (i = 0; i < count; i++) { - double sum = covar_y[i + 1]; - - for (k = i - 1; k >= 0; k--) - sum -= factor[i][k] * m->coeff[0][k]; - - m->coeff[0][i] = sum / factor[i][i]; - } - - for (j = count - 1; j >= min_order; j--) { - for (i = j; i >= 0; i--) { - double sum = m->coeff[0][i]; - - for (k = i + 1; k <= j; k++) - sum -= factor[k][i] * m->coeff[j][k]; - - m->coeff[j][i] = sum / factor[i][i]; - } - - m->variance[j] = covar_y[0]; - - for (i = 0; i <= j; i++) { - double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1]; - - for (k = 0; k < i; k++) - sum += 2 * m->coeff[j][k] * covar[k][i]; - - m->variance[j] += m->coeff[j][i] * sum; - } - } -} - -static double evaluate_lls(LLSModel *m, double *param, int order) -{ - int i; - double out = 0; - - for (i = 0; i <= order; i++) - out += param[i] * m->coeff[order][i]; - - return out; -} - -av_cold void avpriv_init_lls(LLSModel *m, int indep_count) -{ - memset(m, 0, sizeof(LLSModel)); - m->indep_count = indep_count; - m->update_lls = update_lls; - m->evaluate_lls = evaluate_lls; - if (ARCH_X86) - ff_init_lls_x86(m); -} - -#if FF_API_LLS_PRIVATE -av_cold void av_init_lls(LLSModel *m, int indep_count) -{ - avpriv_init_lls(m, indep_count); -} -void av_update_lls(LLSModel *m, double *param, double decay) -{ - m->update_lls(m, param); -} -void av_solve_lls(LLSModel *m, double threshold, int min_order) -{ - avpriv_solve_lls(m, threshold, min_order); -} -double av_evaluate_lls(LLSModel *m, double *param, int order) -{ - return m->evaluate_lls(m, param, order); -} -#endif /* FF_API_LLS_PRIVATE */ - -#ifdef TEST - -#include <stdio.h> -#include <limits.h> -#include "lfg.h" - -int main(void) -{ - LLSModel m; - int i, order; - AVLFG lfg; - - av_lfg_init(&lfg, 1); - avpriv_init_lls(&m, 3); - - for (i = 0; i < 100; i++) { - LOCAL_ALIGNED(32, double, var, [4]); - double eval; - - var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2; - var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; - var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; - var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; - m.update_lls(&m, var); - avpriv_solve_lls(&m, 0.001, 0); - for (order = 0; order < 3; order++) { - eval = m.evaluate_lls(&m, var + 1, order); - printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n", - var[0], order, eval, sqrt(m.variance[order] / (i + 1)), - m.coeff[order][0], m.coeff[order][1], - m.coeff[order][2]); - } - } - return 0; -} - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls.h new/ffmpeg-2.1.1/libavutil/lls.h --- old/ffmpeg-2.1/libavutil/lls.h 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -/* - * linear least squares model - * - * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_LLS_H -#define AVUTIL_LLS_H - -#include "common.h" -#include "mem.h" -#include "version.h" - -#define MAX_VARS 32 -#define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4) - -//FIXME avoid direct access to LLSModel from outside - -/** - * Linear least squares model. - */ -typedef struct LLSModel { - DECLARE_ALIGNED(32, double, covariance[MAX_VARS_ALIGN][MAX_VARS_ALIGN]); - DECLARE_ALIGNED(32, double, coeff[MAX_VARS][MAX_VARS]); - double variance[MAX_VARS]; - int indep_count; - /** - * Take the outer-product of var[] with itself, and add to the covariance matrix. - * @param m this context - * @param var training samples, starting with the value to be predicted - * 32-byte aligned, and any padding elements must be initialized - * (i.e not denormal/nan). - */ - void (*update_lls)(struct LLSModel *m, double *var); - /** - * Inner product of var[] and the LPC coefs. - * @param m this context - * @param var training samples, excluding the value to be predicted. unaligned. - * @param order lpc order - */ - double (*evaluate_lls)(struct LLSModel *m, double *var, int order); -} LLSModel; - -void avpriv_init_lls(LLSModel *m, int indep_count); -void ff_init_lls_x86(LLSModel *m); -void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order); - -#if FF_API_LLS_PRIVATE -void av_init_lls(LLSModel *m, int indep_count); -void av_update_lls(LLSModel *m, double *param, double decay); -void av_solve_lls(LLSModel *m, double threshold, int min_order); -double av_evaluate_lls(LLSModel *m, double *param, int order); -#endif /* FF_API_LLS_PRIVATE */ - -#endif /* AVUTIL_LLS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls1.c new/ffmpeg-2.1.1/libavutil/lls1.c --- old/ffmpeg-2.1/libavutil/lls1.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls1.c 2013-11-20 03:29:07.000000000 +0100 @@ -0,0 +1,180 @@ +/* + * linear least squares model + * + * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * linear least squares model + */ + +#include <math.h> +#include <string.h> + +#include "attributes.h" +#include "version.h" +#include "lls1.h" + +#if FF_API_LLS1 + +av_cold void avpriv_init_lls(LLSModel *m, int indep_count) +{ + memset(m, 0, sizeof(LLSModel)); + m->indep_count = indep_count; +} + +void avpriv_update_lls(LLSModel *m, double *var, double decay) +{ + int i, j; + + for (i = 0; i <= m->indep_count; i++) { + for (j = i; j <= m->indep_count; j++) { + m->covariance[i][j] *= decay; + m->covariance[i][j] += var[i] * var[j]; + } + } +} + +void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order) +{ + int i, j, k; + double (*factor)[MAX_VARS + 1] = (void *) &m->covariance[1][0]; + double (*covar) [MAX_VARS + 1] = (void *) &m->covariance[1][1]; + double *covar_y = m->covariance[0]; + int count = m->indep_count; + + for (i = 0; i < count; i++) { + for (j = i; j < count; j++) { + double sum = covar[i][j]; + + for (k = i - 1; k >= 0; k--) + sum -= factor[i][k] * factor[j][k]; + + if (i == j) { + if (sum < threshold) + sum = 1.0; + factor[i][i] = sqrt(sum); + } else { + factor[j][i] = sum / factor[i][i]; + } + } + } + + for (i = 0; i < count; i++) { + double sum = covar_y[i + 1]; + + for (k = i - 1; k >= 0; k--) + sum -= factor[i][k] * m->coeff[0][k]; + + m->coeff[0][i] = sum / factor[i][i]; + } + + for (j = count - 1; j >= min_order; j--) { + for (i = j; i >= 0; i--) { + double sum = m->coeff[0][i]; + + for (k = i + 1; k <= j; k++) + sum -= factor[k][i] * m->coeff[j][k]; + + m->coeff[j][i] = sum / factor[i][i]; + } + + m->variance[j] = covar_y[0]; + + for (i = 0; i <= j; i++) { + double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1]; + + for (k = 0; k < i; k++) + sum += 2 * m->coeff[j][k] * covar[k][i]; + + m->variance[j] += m->coeff[j][i] * sum; + } + } +} + +double avpriv_evaluate_lls(LLSModel *m, double *param, int order) +{ + int i; + double out = 0; + + for (i = 0; i <= order; i++) + out += param[i] * m->coeff[order][i]; + + return out; +} + +#if FF_API_LLS_PRIVATE +av_cold void av_init_lls(LLSModel *m, int indep_count) +{ + avpriv_init_lls(m, indep_count); +} +void av_update_lls(LLSModel *m, double *param, double decay) +{ + avpriv_update_lls(m, param, decay); +} +void av_solve_lls(LLSModel *m, double threshold, int min_order) +{ + avpriv_solve_lls(m, threshold, min_order); +} +double av_evaluate_lls(LLSModel *m, double *param, int order) +{ + return avpriv_evaluate_lls(m, param, order); +} +#endif /* FF_API_LLS_PRIVATE */ + +#endif /* FF_API_LLS1 */ + +#ifdef TEST + +#include <stdio.h> +#include <limits.h> +#include "lfg.h" + +int main(void) +{ + LLSModel m; + int i, order; + AVLFG lfg; + + av_lfg_init(&lfg, 1); + avpriv_init_lls(&m, 3); + + for (i = 0; i < 100; i++) { + double var[4]; + double eval; + + var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2; + var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + avpriv_update_lls(&m, var, 0.99); + avpriv_solve_lls(&m, 0.001, 0); + for (order = 0; order < 3; order++) { + eval = avpriv_evaluate_lls(&m, var + 1, order); + printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n", + var[0], order, eval, sqrt(m.variance[order] / (i + 1)), + m.coeff[order][0], m.coeff[order][1], + m.coeff[order][2]); + } + } + return 0; +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls1.h new/ffmpeg-2.1.1/libavutil/lls1.h --- old/ffmpeg-2.1/libavutil/lls1.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls1.h 2013-11-20 03:29:07.000000000 +0100 @@ -0,0 +1,54 @@ +/* + * linear least squares model + * + * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_LLS_H +#define AVUTIL_LLS_H + +#include "version.h" + +#define MAX_VARS 32 + +//FIXME avoid direct access to LLSModel from outside + +/** + * Linear least squares model. + */ +typedef struct LLSModel { + double covariance[MAX_VARS + 1][MAX_VARS + 1]; + double coeff[MAX_VARS][MAX_VARS]; + double variance[MAX_VARS]; + int indep_count; +} LLSModel; + +void avpriv_init_lls(LLSModel *m, int indep_count); +void avpriv_update_lls(LLSModel *m, double *param, double decay); +void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order); +double avpriv_evaluate_lls(LLSModel *m, double *param, int order); + +#if FF_API_LLS_PRIVATE +void av_init_lls(LLSModel *m, int indep_count); +void av_update_lls(LLSModel *m, double *param, double decay); +void av_solve_lls(LLSModel *m, double threshold, int min_order); +double av_evaluate_lls(LLSModel *m, double *param, int order); +#endif /* FF_API_LLS_PRIVATE */ + +#endif /* AVUTIL_LLS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls2.c new/ffmpeg-2.1.1/libavutil/lls2.c --- old/ffmpeg-2.1/libavutil/lls2.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls2.c 2013-11-20 03:29:07.000000000 +0100 @@ -0,0 +1,160 @@ +/* + * linear least squares model + * + * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * linear least squares model + */ + +#include <math.h> +#include <string.h> + +#include "attributes.h" +#include "version.h" +#include "lls2.h" + +static void update_lls(LLSModel2 *m, double *var) +{ + int i, j; + + for (i = 0; i <= m->indep_count; i++) { + for (j = i; j <= m->indep_count; j++) { + m->covariance[i][j] += var[i] * var[j]; + } + } +} + +void avpriv_solve_lls2(LLSModel2 *m, double threshold, unsigned short min_order) +{ + int i, j, k; + double (*factor)[MAX_VARS_ALIGN] = (void *) &m->covariance[1][0]; + double (*covar) [MAX_VARS_ALIGN] = (void *) &m->covariance[1][1]; + double *covar_y = m->covariance[0]; + int count = m->indep_count; + + for (i = 0; i < count; i++) { + for (j = i; j < count; j++) { + double sum = covar[i][j]; + + for (k = i - 1; k >= 0; k--) + sum -= factor[i][k] * factor[j][k]; + + if (i == j) { + if (sum < threshold) + sum = 1.0; + factor[i][i] = sqrt(sum); + } else { + factor[j][i] = sum / factor[i][i]; + } + } + } + + for (i = 0; i < count; i++) { + double sum = covar_y[i + 1]; + + for (k = i - 1; k >= 0; k--) + sum -= factor[i][k] * m->coeff[0][k]; + + m->coeff[0][i] = sum / factor[i][i]; + } + + for (j = count - 1; j >= min_order; j--) { + for (i = j; i >= 0; i--) { + double sum = m->coeff[0][i]; + + for (k = i + 1; k <= j; k++) + sum -= factor[k][i] * m->coeff[j][k]; + + m->coeff[j][i] = sum / factor[i][i]; + } + + m->variance[j] = covar_y[0]; + + for (i = 0; i <= j; i++) { + double sum = m->coeff[j][i] * covar[i][i] - 2 * covar_y[i + 1]; + + for (k = 0; k < i; k++) + sum += 2 * m->coeff[j][k] * covar[k][i]; + + m->variance[j] += m->coeff[j][i] * sum; + } + } +} + +static double evaluate_lls(LLSModel2 *m, double *param, int order) +{ + int i; + double out = 0; + + for (i = 0; i <= order; i++) + out += param[i] * m->coeff[order][i]; + + return out; +} + +av_cold void avpriv_init_lls2(LLSModel2 *m, int indep_count) +{ + memset(m, 0, sizeof(LLSModel2)); + m->indep_count = indep_count; + m->update_lls = update_lls; + m->evaluate_lls = evaluate_lls; + if (ARCH_X86) + ff_init_lls_x86(m); +} + +#ifdef TEST + +#include <stdio.h> +#include <limits.h> +#include "lfg.h" + +int main(void) +{ + LLSModel2 m; + int i, order; + AVLFG lfg; + + av_lfg_init(&lfg, 1); + avpriv_init_lls2(&m, 3); + + for (i = 0; i < 100; i++) { + LOCAL_ALIGNED(32, double, var, [4]); + double eval; + + var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2; + var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + m.update_lls(&m, var); + avpriv_solve_lls2(&m, 0.001, 0); + for (order = 0; order < 3; order++) { + eval = m.evaluate_lls(&m, var + 1, order); + printf("real:%9f order:%d pred:%9f var:%f coeffs:%f %9f %9f\n", + var[0], order, eval, sqrt(m.variance[order] / (i + 1)), + m.coeff[order][0], m.coeff[order][1], + m.coeff[order][2]); + } + } + return 0; +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/lls2.h new/ffmpeg-2.1.1/libavutil/lls2.h --- old/ffmpeg-2.1/libavutil/lls2.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/lls2.h 2013-11-20 03:29:07.000000000 +0100 @@ -0,0 +1,64 @@ +/* + * linear least squares model + * + * Copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_LLS_H +#define AVUTIL_LLS_H + +#include "common.h" +#include "mem.h" +#include "version.h" + +#define MAX_VARS 32 +#define MAX_VARS_ALIGN FFALIGN(MAX_VARS+1,4) + +//FIXME avoid direct access to LLSModel2 from outside + +/** + * Linear least squares model. + */ +typedef struct LLSModel2 { + DECLARE_ALIGNED(32, double, covariance[MAX_VARS_ALIGN][MAX_VARS_ALIGN]); + DECLARE_ALIGNED(32, double, coeff[MAX_VARS][MAX_VARS]); + double variance[MAX_VARS]; + int indep_count; + /** + * Take the outer-product of var[] with itself, and add to the covariance matrix. + * @param m this context + * @param var training samples, starting with the value to be predicted + * 32-byte aligned, and any padding elements must be initialized + * (i.e not denormal/nan). + */ + void (*update_lls)(struct LLSModel2 *m, double *var); + /** + * Inner product of var[] and the LPC coefs. + * @param m this context + * @param var training samples, excluding the value to be predicted. unaligned. + * @param order lpc order + */ + double (*evaluate_lls)(struct LLSModel2 *m, double *var, int order); +} LLSModel2; + +void avpriv_init_lls2(LLSModel2 *m, int indep_count); +void ff_init_lls_x86(LLSModel2 *m); +void avpriv_solve_lls2(LLSModel2 *m, double threshold, unsigned short min_order); + +#endif /* AVUTIL_LLS_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/version.h new/ffmpeg-2.1.1/libavutil/version.h --- old/ffmpeg-2.1/libavutil/version.h 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/version.h 2013-11-20 03:29:07.000000000 +0100 @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 48 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -132,6 +132,9 @@ #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 53) #endif +#ifndef FF_API_LLS1 +#define FF_API_LLS1 (LIBAVUTIL_VERSION_MAJOR < 53) +#endif #ifndef FF_API_AVFRAME_LAVC #define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 53) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/x86/lls.asm new/ffmpeg-2.1.1/libavutil/x86/lls.asm --- old/ffmpeg-2.1/libavutil/x86/lls.asm 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/x86/lls.asm 2013-11-20 03:29:07.000000000 +0100 @@ -29,7 +29,7 @@ %define COVAR_STRIDE MAX_VARS_ALIGN*8 %define COVAR(x,y) [covarq + (x)*8 + (y)*COVAR_STRIDE] -struc LLSModel +struc LLSModel2 .covariance: resq MAX_VARS_ALIGN*MAX_VARS_ALIGN .coeff: resq MAX_VARS*MAX_VARS .variance: resq MAX_VARS @@ -49,7 +49,7 @@ %define movdqa movaps cglobal update_lls, 2,5,8, ctx, var, i, j, covar2 %define covarq ctxq - mov id, [ctxq + LLSModel.indep_count] + mov id, [ctxq + LLSModel2.indep_count] lea varq, [varq + iq*8] neg iq mov covar2q, covarq @@ -129,7 +129,7 @@ INIT_YMM avx cglobal update_lls, 3,6,8, ctx, var, count, i, j, count2 %define covarq ctxq - mov countd, [ctxq + LLSModel.indep_count] + mov countd, [ctxq + LLSModel2.indep_count] lea count2d, [countq-2] xor id, id .loopi: @@ -206,7 +206,7 @@ %define coefsq ctxq mov id, orderd imul orderd, MAX_VARS - lea coefsq, [ctxq + LLSModel.coeff + orderq*8] + lea coefsq, [ctxq + LLSModel2.coeff + orderq*8] movsd m0, [varq] movhpd m0, [varq + 8] mulpd m0, [coefsq] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-2.1/libavutil/x86/lls_init.c new/ffmpeg-2.1.1/libavutil/x86/lls_init.c --- old/ffmpeg-2.1/libavutil/x86/lls_init.c 2013-10-28 01:58:06.000000000 +0100 +++ new/ffmpeg-2.1.1/libavutil/x86/lls_init.c 2013-11-20 03:29:07.000000000 +0100 @@ -20,14 +20,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/lls.h" +#include "libavutil/lls2.h" #include "libavutil/x86/cpu.h" -void ff_update_lls_sse2(LLSModel *m, double *var); -void ff_update_lls_avx(LLSModel *m, double *var); -double ff_evaluate_lls_sse2(LLSModel *m, double *var, int order); +void ff_update_lls_sse2(LLSModel2 *m, double *var); +void ff_update_lls_avx(LLSModel2 *m, double *var); +double ff_evaluate_lls_sse2(LLSModel2 *m, double *var, int order); -av_cold void ff_init_lls_x86(LLSModel *m) +av_cold void ff_init_lls_x86(LLSModel2 *m) { int cpu_flags = av_get_cpu_flags(); if (EXTERNAL_SSE2(cpu_flags)) { ++++++ libavutil-2.1-cripple.patch -> libavutil-2.1.1-cripple.patch ++++++ --- /work/SRC/openSUSE:Factory/libavutil/libavutil-2.1-cripple.patch 2013-11-17 20:19:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libavutil.new/libavutil-2.1.1-cripple.patch 2013-11-29 07:01:37.000000000 +0100 @@ -1,6 +1,6 @@ -diff -ur ffmpeg-2.1.orig/configure ffmpeg-2.1/configure ---- ffmpeg-2.1.orig/configure 2013-10-28 01:58:04.000000000 +0100 -+++ ffmpeg-2.1/configure 2013-11-09 17:02:38.138479786 +0100 +diff -ur ffmpeg-2.1.1.orig/configure ffmpeg-2.1.1/configure +--- ffmpeg-2.1.1.orig/configure 2013-11-20 03:29:07.000000000 +0100 ++++ ffmpeg-2.1.1/configure 2013-11-20 21:17:12.335506063 +0100 @@ -1236,14 +1236,7 @@ " @@ -35,9 +35,9 @@ ALL_COMPONENTS=" $BSF_LIST $DECODER_LIST -diff -ur ffmpeg-2.1.orig/libavutil/frame.h ffmpeg-2.1/libavutil/frame.h ---- ffmpeg-2.1.orig/libavutil/frame.h 2013-10-28 01:58:06.000000000 +0100 -+++ ffmpeg-2.1/libavutil/frame.h 2013-11-09 17:03:30.307167925 +0100 +diff -ur ffmpeg-2.1.1.orig/libavutil/frame.h ffmpeg-2.1.1/libavutil/frame.h +--- ffmpeg-2.1.1.orig/libavutil/frame.h 2013-11-20 03:28:58.000000000 +0100 ++++ ffmpeg-2.1.1/libavutil/frame.h 2013-11-20 21:17:12.336506040 +0100 @@ -22,8 +22,6 @@ #include <stdint.h> @@ -47,9 +47,9 @@ #include "avutil.h" #include "buffer.h" #include "dict.h" -diff -ur ffmpeg-2.1.orig/tests/Makefile ffmpeg-2.1/tests/Makefile ---- ffmpeg-2.1.orig/tests/Makefile 2013-10-28 01:58:06.000000000 +0100 -+++ ffmpeg-2.1/tests/Makefile 2013-11-09 17:04:30.244660726 +0100 +diff -ur ffmpeg-2.1.1.orig/tests/Makefile ffmpeg-2.1.1/tests/Makefile +--- ffmpeg-2.1.1.orig/tests/Makefile 2013-11-20 03:28:58.000000000 +0100 ++++ ffmpeg-2.1.1/tests/Makefile 2013-11-20 21:17:12.336506040 +0100 @@ -72,68 +72,6 @@ FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '13

29 Nov '13

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2013-11-29 07:01:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-cubox.changes 2013-11-25 14:33:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-cubox.changes 2013-11-29 07:01:19.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Nov 27 17:59:14 CET 2013 - duwe(a)suse.de + +- pstore: automatically dump and clean dmesg entries + (fate#315232). +- Update config files. +- commit 9525160 + +------------------------------------------------------------------- +Tue Nov 26 17:28:52 CET 2013 - agraf(a)suse.de + +- omapdrm: fix compile with dma_addr_t > u32. +- commit 611f4eb + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-exynos.changes: same change kernel-lpae.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-cubox.spec ++++++ --- /var/tmp/diff_new_pack.xeRkpj/_old 2013-11-29 07:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.xeRkpj/_new 2013-11-29 07:01:23.000000000 +0100 @@ -61,7 +61,7 @@ Summary: Kernel for SolidRun Cubox Version: 3.12.1 %if 0%{?is_kotd} -Release: <RELEASE>.g1e06fbe +Release: <RELEASE>.g9525160 %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change kernel-desktop.spec: same change kernel-docs.spec: same change kernel-ec2.spec: same change kernel-exynos.spec: same change kernel-lpae.spec: same change kernel-pae.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.xeRkpj/_old 2013-11-29 07:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.xeRkpj/_new 2013-11-29 07:01:23.000000000 +0100 @@ -26,7 +26,7 @@ Version: 3.12.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g1e06fbe +Release: <RELEASE>.g9525160 %else Release: 0 %endif ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.xeRkpj/_old 2013-11-29 07:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.xeRkpj/_new 2013-11-29 07:01:23.000000000 +0100 @@ -61,7 +61,7 @@ Summary: The Standard Kernel with Tracing Features Version: 3.12.1 %if 0%{?is_kotd} -Release: <RELEASE>.g1e06fbe +Release: <RELEASE>.g9525160 %else Release: 0 %endif kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/debug 2013-11-27 17:59:14.000000000 +0100 @@ -5456,7 +5456,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=y -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/default 2013-11-27 17:59:14.000000000 +0100 @@ -5488,7 +5488,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=y -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/desktop new/config/x86_64/desktop --- old/config/x86_64/desktop 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/desktop 2013-11-27 17:59:14.000000000 +0100 @@ -5485,7 +5485,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=y -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/trace new/config/x86_64/trace --- old/config/x86_64/trace 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/trace 2013-11-27 17:59:14.000000000 +0100 @@ -5489,7 +5489,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=y -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/vanilla 2013-11-27 17:59:14.000000000 +0100 @@ -5482,7 +5482,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=y -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2013-11-20 14:47:00.000000000 +0100 +++ new/config/x86_64/xen 2013-11-27 17:59:14.000000000 +0100 @@ -5308,7 +5308,8 @@ # EFI (Extensible Firmware Interface) Support # CONFIG_EFI_VARS=m -# CONFIG_EFI_VARS_PSTORE is not set +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # # File systems ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/arm-omapfb-fix.patch new/patches.arch/arm-omapfb-fix.patch --- old/patches.arch/arm-omapfb-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/arm-omapfb-fix.patch 2013-11-26 17:28:52.000000000 +0100 @@ -0,0 +1,44 @@ +From: Alexander Graf <agraf(a)suse.de> +Date: Weg, 20 Mar 2013 15:17:25 +0100 +Subject: [PATCH] omapdrm: fix compile with dma_addr_t > u32 +Patch-Mainline: No + +The omap_fb module passes a pointer to a u32 field to a function that expects a +dma_addr_t * parameter. Make the field dma_addr_t instead - it's an address after +all. + +Fixes the following breakage: + + drivers/gpu/drm/omapdrm/omap_fb.c:231:6: error: passing argument 5 of 'omap_gem_rotated_paddr' from incompatible pointer type [-Werror] + + +Signed-off-by: Alexander Graf <agraf(a)suse.de> + +Index: current/include/video/omapdss.h +=================================================================== +--- current.orig/include/video/omapdss.h ++++ current/include/video/omapdss.h +@@ -389,8 +389,8 @@ struct omap_dss_cpr_coefs { + }; + + struct omap_overlay_info { +- u32 paddr; +- u32 p_uv_addr; /* for NV12 format */ ++ dma_addr_t paddr; ++ dma_addr_t p_uv_addr; /* for NV12 format */ + u16 screen_width; + u16 width; + u16 height; +Index: current/drivers/gpu/drm/omapdrm/Makefile +=================================================================== +--- current.orig/drivers/gpu/drm/omapdrm/Makefile ++++ current/drivers/gpu/drm/omapdrm/Makefile +@@ -3,7 +3,7 @@ + # Direct Rendering Infrastructure (DRI) + # + +-ccflags-y := -Iinclude/drm -Werror ++ccflags-y := -Iinclude/drm + omapdrm-y := omap_drv.o \ + omap_irq.o \ + omap_debugfs.o \ ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/pstore-backend-autoaction new/patches.suse/pstore-backend-autoaction --- old/patches.suse/pstore-backend-autoaction 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/pstore-backend-autoaction 2013-11-27 17:59:14.000000000 +0100 @@ -0,0 +1,133 @@ +From: Torsten Duwe <duwe(a)suse.de> +Subject: pstore: automatically dump and clean dmesg entries +Patch-mainline: not yet +References: fate#315232 + +Dump a previous oops or panic, which has made it to pstore, +to the new syslog after reboot, optinally deleting it. +This can happen automatically, without user land interaction. + +Signed-off-by: Torsten Duwe <duwe(a)suse.de> + +Index: fs/pstore/internal.h +=================================================================== +--- a/fs/pstore/internal.h.orig ++++ b/fs/pstore/internal.h +@@ -48,7 +48,14 @@ static inline void pstore_register_ftrac + extern struct pstore_info *psinfo; + + extern void pstore_set_kmsg_bytes(int); +-extern void pstore_get_records(int); ++extern void pstore_get_records(unsigned); ++/* Flags for the pstore iterator pstore_get_records() */ ++#define PGR_QUIET 0 ++#define PGR_VERBOSE 1 ++#define PGR_POPULATE 2 ++#define PGR_SYSLOG 4 ++#define PGR_CLEAR 8 ++ + extern int pstore_mkfile(enum pstore_type_id, char *psname, u64 id, + int count, char *data, bool compressed, + size_t size, struct timespec time, +Index: fs/pstore/inode.c +=================================================================== +--- a/fs/pstore/inode.c.orig ++++ b/fs/pstore/inode.c +@@ -406,7 +406,7 @@ static int pstore_fill_super(struct supe + if (!sb->s_root) + return -ENOMEM; + +- pstore_get_records(0); ++ pstore_get_records(PGR_VERBOSE|PGR_POPULATE); + + return 0; + } +Index: fs/pstore/platform.c +=================================================================== +--- a/fs/pstore/platform.c.orig ++++ b/fs/pstore/platform.c +@@ -65,6 +65,10 @@ static DEFINE_SPINLOCK(pstore_lock); + struct pstore_info *psinfo; + + static char *backend; ++static int auto_action=0; ++module_param(auto_action, int, 0664); ++MODULE_PARM_DESC(auto_action, "action to take on backend " ++ "registration: 0=nothing, 1=print, 2=print+clear"); + + /* Compression parameters */ + #define COMPR_LEVEL 6 +@@ -77,6 +81,8 @@ static size_t big_oops_buf_sz; + + /* How much of the console log to snapshot */ + static unsigned long kmsg_bytes = 10240; ++module_param(kmsg_bytes, ulong, 0644); ++MODULE_PARM_DESC(kmsg_bytes, "maximum size to save of a crash dump"); + + void pstore_set_kmsg_bytes(int bytes) + { +@@ -448,7 +454,11 @@ int pstore_register(struct pstore_info * + allocate_buf_for_compression(); + + if (pstore_is_mounted()) +- pstore_get_records(0); ++ pstore_get_records(PGR_VERBOSE|PGR_POPULATE); ++ ++ if (auto_action) ++ pstore_get_records(PGR_SYSLOG| ++ ((auto_action>1)?PGR_CLEAR:0)); + + kmsg_dump_register(&pstore_dumper); + pstore_register_console(); +@@ -473,7 +483,7 @@ EXPORT_SYMBOL_GPL(pstore_register); + * when we are re-scanning the backing store looking to add new + * error records. + */ +-void pstore_get_records(int quiet) ++void pstore_get_records(unsigned flags) + { + struct pstore_info *psi = psinfo; + char *buf = NULL; +@@ -511,15 +521,30 @@ void pstore_get_records(int quiet) + compressed = true; + } + } +- rc = pstore_mkfile(type, psi->name, id, count, buf, +- compressed, (size_t)size, time, psi); ++ ++ if (flags & PGR_POPULATE) ++ rc = pstore_mkfile(type, psi->name, id, count, buf, ++ compressed, (size_t)size, time, psi); ++ ++ if (type == PSTORE_TYPE_DMESG) { ++ if (flags & PGR_SYSLOG) { ++ char _fmt[32]; ++ snprintf(_fmt, 32, KERN_NOTICE "%%%ds\\n", size); ++ pr_notice("---------- pstore: ----------\n"); ++ printk(_fmt, buf); ++ pr_notice("-----------------------------\n"); ++ } ++ if (flags & PGR_CLEAR && psi->erase) ++ psi->erase(type, id, size, time, psi); ++ } ++ + if (unzipped_len < 0) { + /* Free buffer other than big oops */ + kfree(buf); + buf = NULL; + } else + unzipped_len = -1; +- if (rc && (rc != -EEXIST || !quiet)) ++ if (rc && (rc != -EEXIST || (flags & PGR_VERBOSE))) + failed++; + } + if (psi->close) +@@ -534,7 +560,7 @@ out: + + static void pstore_dowork(struct work_struct *work) + { +- pstore_get_records(1); ++ pstore_get_records(PGR_QUIET|PGR_POPULATE); + } + + static void pstore_timefunc(unsigned long dummy) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.xeRkpj/_old 2013-11-29 07:01:25.000000000 +0100 +++ /var/tmp/diff_new_pack.xeRkpj/_new 2013-11-29 07:01:25.000000000 +0100 @@ -157,6 +157,7 @@ patches.arch/arm-OMAP-Fix-missing-cm3xxx.h-include.patch patches.arch/arm-OMAP-Fix-missing-usb.h-include.patch patches.arch/arm-omap3isp.patch + patches.arch/arm-omapfb-fix.patch # Compile fix for Xen on ARM with our Xen patches applied patches.arch/arm-xen-fixup.patch @@ -323,6 +324,8 @@ ######################################################## patches.drivers/pstore_disable_efi_backend_by_default.patch + patches.suse/pstore-backend-autoaction + ######################################################## # Overlayfs ######################################################## ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.xeRkpj/_old 2013-11-29 07:01:25.000000000 +0100 +++ /var/tmp/diff_new_pack.xeRkpj/_new 2013-11-29 07:01:25.000000000 +0100 @@ -1,3 +1,3 @@ -2013-11-21 00:04:25 +0100 -GIT Revision: 1e06fbeab3dabef01d2a3b4d68dbf5531de7cbc9 +2013-11-27 17:59:14 +0100 +GIT Revision: 95251609bf4b80b267dcd6e7de98538b1dd989d1 GIT Branch: master -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-11-28 19:10:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-11-22 07:29:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-11-28 19:10:17.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 26 15:11:04 CET 2013 - aschnell(a)suse.de + +- disable btrfs multivolume support (bnc#832196) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/package/yast2-storage.changes new/yast2-storage-3.1.2/package/yast2-storage.changes --- old/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-19 15:19:42.000000000 +0100 +++ new/yast2-storage-3.1.2/package/yast2-storage.changes 2013-11-26 17:29:50.000000000 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 26 15:11:04 CET 2013 - aschnell(a)suse.de + +- disable btrfs multivolume support (bnc#832196) + +------------------------------------------------------------------- Tue Nov 19 15:15:29 CET 2013 - aschnell(a)suse.de - removed code to translate EVMS device names during update (see diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb new/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb --- old/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb 2013-11-19 15:19:42.000000000 +0100 +++ new/yast2-storage-3.1.2/src/include/partitioning/ep-btrfs.rb 2013-11-26 17:29:50.000000000 +0100 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2013] Novell, Inc. # # All Rights Reserved. # @@ -32,27 +32,33 @@ Yast.include include_target, "partitioning/ep-btrfs-lib.rb" end + def EpContextMenuBtrfs(device) widget = ContextMenu.Simple( [ + # TRANSLATORS: context menu entry Item(Id(:edit), _("Edit")), - Item(Id(:delete), _("Delete")), - Item(Id(:resize), _("Resize")) + # TRANSLATORS: context menu entry + # disabled, see bnc #832196 + # Item(Id(:resize), _("Resize")), + # TRANSLATORS: context menu entry + Item(Id(:delete), _("Delete")) ] ) case widget when :edit EpEditBtrfsDevice(device) - when :delete - EpDeleteBtrfsDevice(device) when :resize EpResizeBtrfsDevice(device) + when :delete + EpDeleteBtrfsDevice(device) end nil end + def HandleBtrfsButtons(user_data, device, event) user_data = deep_copy(user_data) event = deep_copy(event) @@ -84,11 +90,14 @@ EpEditBtrfsDevice(device) when :resize EpResizeBtrfsDevice(device) + when :delete + EpDeleteBtrfsDevice(device) end nil end + def CreateBtrfsMainPanel(user_data) user_data = deep_copy(user_data) fields = StorageSettings.FilterTable( @@ -127,11 +136,15 @@ ), ArrangeButtons( [ + # TRANSLATORS: push button text PushButton(Id(:edit), Opt(:key_F4), _("Edit...")), - # push button text - PushButton(Id(:resize), Opt(:key_F8), _("Resize...")), + # TRANSLATORS: push button text + # disabled, see bnc #832196 + # PushButton(Id(:resize), Opt(:key_F8), _("Resize...")), + # TRANSLATORS: push button text + PushButton(Id(:delete), Opt(:key_F5), _("Delete...")), HStretch() - ] # push button text + ] ) ) ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-11-28 19:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-11-26 06:16:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-11-28 19:09:25.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 15:07:16 UTC 2013 - jreidinger(a)suse.com + +- fix distribution of client for detection DHCP capable cards +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.8.tar.bz2 New: ---- yast2-network-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.7G6UU5/_old 2013-11-28 19:09:26.000000000 +0100 +++ /var/tmp/diff_new_pack.7G6UU5/_new 2013-11-28 19:09:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.8.tar.bz2 -> yast2-network-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.8/VERSION new/yast2-network-3.1.9/VERSION --- old/yast2-network-3.1.8/VERSION 2013-11-25 15:17:24.000000000 +0100 +++ new/yast2-network-3.1.9/VERSION 2013-11-28 16:28:28.000000000 +0100 @@ -1 +1 @@ -3.1.8 +3.1.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.8/package/yast2-network.changes new/yast2-network-3.1.9/package/yast2-network.changes --- old/yast2-network-3.1.8/package/yast2-network.changes 2013-11-25 15:17:24.000000000 +0100 +++ new/yast2-network-3.1.9/package/yast2-network.changes 2013-11-28 16:28:28.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 28 15:07:16 UTC 2013 - jreidinger(a)suse.com + +- fix distribution of client for detection DHCP capable cards +- 3.1.9 + +------------------------------------------------------------------- Mon Nov 25 13:29:43 UTC 2013 - jreidinger(a)suse.com - add installation client that detect all DHCP capable network diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.8/package/yast2-network.spec new/yast2-network-3.1.9/package/yast2-network.spec --- old/yast2-network-3.1.8/package/yast2-network.spec 2013-11-25 15:17:24.000000000 +0100 +++ new/yast2-network-3.1.9/package/yast2-network.spec 2013-11-28 16:28:28.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.8/src/Makefile.am new/yast2-network-3.1.9/src/Makefile.am --- old/yast2-network-3.1.8/src/Makefile.am 2013-11-25 15:17:24.000000000 +0100 +++ new/yast2-network-3.1.9/src/Makefile.am 2013-11-28 16:28:28.000000000 +0100 @@ -35,6 +35,7 @@ clients/firewall_stage1_finish.rb \ clients/inst_netprobe.rb \ clients/inst_do_net_test.rb \ + clients/inst_setup_dhcp.rb \ clients/routing.rb \ clients/lan.rb \ clients/host_auto.rb \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2013-11-28 19:08:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2013-11-21 15:26:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2013-11-28 19:08:23.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 13:01:44 UTC 2013 - vmoravec(a)suse.com + +- Add hooks to main installation client +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.7.tar.bz2 New: ---- yast2-installation-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.de2ohG/_old 2013-11-28 19:08:24.000000000 +0100 +++ /var/tmp/diff_new_pack.de2ohG/_new 2013-11-28 19:08:24.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,13 +45,13 @@ BuildRequires: libxml2-tools # Linuxrc.keys -BuildRequires: yast2 >= 3.1.1 +BuildRequires: yast2 >= 3.1.6 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductProfile -Requires: yast2 >= 3.0.2 +Requires: yast2 >= 3.1.6 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) @@ -158,6 +158,8 @@ %suse_update_desktop_file $f done +mkdir -p %{buildroot}%{yast_vardir}/hooks/installation + mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE1} %{buildroot}%{_unitdir} install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} @@ -217,6 +219,10 @@ # programs and scripts %{yast_ystartupdir}/startup +# installation hooks +%dir %{yast_vardir}/hooks +%dir %{yast_vardir}/hooks/installation + %dir %{yast_docdir} %{yast_docdir}/COPYING ++++++ yast2-installation-3.1.7.tar.bz2 -> yast2-installation-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/VERSION new/yast2-installation-3.1.8/VERSION --- old/yast2-installation-3.1.7/VERSION 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/VERSION 2013-11-28 14:25:30.000000000 +0100 @@ -1 +1 @@ -3.1.7 +3.1.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/control/control.SLED.xml new/yast2-installation-3.1.8/control/control.SLED.xml --- old/yast2-installation-3.1.7/control/control.SLED.xml 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/control/control.SLED.xml 2013-11-28 14:25:30.000000000 +0100 @@ -475,6 +475,10 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> + <module> <name>complex_welcome</name> <label>Welcome</label> <enable_back>no</enable_back> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/control/control.SLES-for-VMware.xml new/yast2-installation-3.1.8/control/control.SLES-for-VMware.xml --- old/yast2-installation-3.1.7/control/control.SLES-for-VMware.xml 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/control/control.SLES-for-VMware.xml 2013-11-28 14:25:30.000000000 +0100 @@ -681,6 +681,10 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> + <module> <name>complex_welcome</name> <label>Welcome</label> <enable_back>no</enable_back> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/control/control.SLES.xml new/yast2-installation-3.1.8/control/control.SLES.xml --- old/yast2-installation-3.1.7/control/control.SLES.xml 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/control/control.SLES.xml 2013-11-28 14:25:30.000000000 +0100 @@ -706,6 +706,10 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> + <module> <name>complex_welcome</name> <label>Welcome</label> <enable_back>no</enable_back> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/control/control.openSUSE.xml new/yast2-installation-3.1.8/control/control.openSUSE.xml --- old/yast2-installation-3.1.7/control/control.openSUSE.xml 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/control/control.openSUSE.xml 2013-11-28 14:25:30.000000000 +0100 @@ -548,6 +548,10 @@ <stage>initial</stage> <modules config:type="list"> <module> + <label>Network Autosetup</label> + <name>setup_dhcp</name> + </module> + <module> <label>Welcome</label> <name>complex_welcome</name> <enable_back>no</enable_back> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/package/yast2-installation.changes new/yast2-installation-3.1.8/package/yast2-installation.changes --- old/yast2-installation-3.1.7/package/yast2-installation.changes 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/package/yast2-installation.changes 2013-11-28 14:25:30.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 28 13:01:44 UTC 2013 - vmoravec(a)suse.com + +- Add hooks to main installation client +- 3.1.8 + +------------------------------------------------------------------- Wed Nov 20 13:21:57 UTC 2013 - lslezak(a)suse.cz - removed support for automatic 2nd stage (the 2nd stage has been diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/package/yast2-installation.spec new/yast2-installation-3.1.8/package/yast2-installation.spec --- old/yast2-installation-3.1.7/package/yast2-installation.spec 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/package/yast2-installation.spec 2013-11-28 14:25:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,13 +42,13 @@ BuildRequires: libxml2-tools # Linuxrc.keys -BuildRequires: yast2 >= 3.1.1 +BuildRequires: yast2 >= 3.1.6 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 # ProductProfile -Requires: yast2 >= 3.0.2 +Requires: yast2 >= 3.1.6 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) @@ -154,6 +154,8 @@ %suse_update_desktop_file $f done +mkdir -p %{buildroot}%{yast_vardir}/hooks/installation + mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE1} %{buildroot}%{_unitdir} install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} @@ -214,6 +216,10 @@ # programs and scripts %{yast_ystartupdir}/startup +# installation hooks +%dir %{yast_vardir}/hooks +%dir %{yast_vardir}/hooks/installation + %dir %{yast_docdir} %{yast_docdir}/COPYING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/src/Makefile.am new/yast2-installation-3.1.8/src/Makefile.am --- old/yast2-installation-3.1.7/src/Makefile.am 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/src/Makefile.am 2013-11-28 14:25:30.000000000 +0100 @@ -74,7 +74,6 @@ yncludedir = @yncludedir@/installation ynclude_DATA = \ include/installation/inst_inc_second.rb \ - include/installation/scr_switch_debugger.rb \ include/installation/inst_inc_first.rb \ include/installation/misc.rb \ include/installation/inst_inc_all.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/src/clients/installation.rb new/yast2-installation-3.1.8/src/clients/installation.rb --- old/yast2-installation-3.1.7/src/clients/installation.rb 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/src/clients/installation.rb 2013-11-28 14:25:30.000000000 +0100 @@ -36,6 +36,9 @@ Yast.import "Wizard" Yast.import "Stage" Yast.import "Report" + Yast.import "Hooks" + + Hooks.search_path.join!('installation') # Initialize the UI Wizard.OpenNextBackDialog @@ -59,12 +62,14 @@ # Call the real installation Builtins.y2milestone("=== installation ===") + Hooks.run 'installation_start' + # First-stage (initial installation) if Stage.initial Builtins.y2milestone( "Stage::initial -> running inst_worker_initial client" ) - @ret = WFM.CallFunction("inst_worker_initial", WFM.Args) + @ret = WFM.CallFunction("inst_worker_initial", WFM.Args) # Second-stage (initial installation) elsif Stage.cont @@ -80,6 +85,8 @@ Builtins.y2milestone("Installation ret: %1", @ret) Builtins.y2milestone("=== installation ===") + Hooks.run 'installation_finish' + # Shutdown the UI Wizard.CloseDialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/src/clients/switch_scr_finish.rb new/yast2-installation-3.1.8/src/clients/switch_scr_finish.rb --- old/yast2-installation-3.1.7/src/clients/switch_scr_finish.rb 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/src/clients/switch_scr_finish.rb 2013-11-28 14:25:30.000000000 +0100 @@ -40,8 +40,6 @@ Yast.import "Directory" Yast.import "Installation" - Yast.include self, "installation/scr_switch_debugger.rb" - @ret = nil @func = "" @param = {} @@ -93,7 +91,6 @@ if Installation.scr_handle == nil || Ops.less_than(Installation.scr_handle, 0) Builtins.y2error("Cannot switch to the system") - ErrorDuringSCRSwitch(Installation.destdir) return false end @@ -106,8 +103,7 @@ # bnc #433057 # Even if SCR switch worked, run a set of some simple tests if TestTheNewSCRHandler() != true - Builtins.y2error("Cannot switch to the system") - ErrorDuringSCRSwitch(Installation.destdir) + Builtins.y2error("Switched SCR do not work properly.") return false end else @@ -120,20 +116,6 @@ deep_copy(@ret) end - # SCR Switch failed. Reporting error, collecting data. - # We don't ask whether to run the debugger, just run it. - # - # bnc #201058, #411832 - def ErrorDuringSCRSwitch(chroot_dir) - Builtins.y2error( - "Cannot switch to SCR '%1', running debugger", - chroot_dir - ) - RunSCRSwitchDebugger(chroot_dir) - - nil - end - # Check the new SCR, bnc #433057 # # @return [Boolean] whether successful @@ -191,14 +173,8 @@ end def TestTheNewSCRHandler - _SCR_PID = FindSCRPID() - - SwitchY2Debug(_SCR_PID) if Ops.greater_than(_SCR_PID, 0) - ret = TestTheNewSCR() - SwitchY2Debug(_SCR_PID) if Ops.greater_than(_SCR_PID, 0) - # BNC #460477 CheckFreeSpaceNow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.8/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.7/src/include/installation/inst_inc_first.rb 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/src/include/installation/inst_inc_first.rb 2013-11-28 14:25:30.000000000 +0100 @@ -148,10 +148,6 @@ end end - # Initializing the default values for AC - # @see bnc #404122 - ProductControl.InitAutomaticConfiguration - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.7/src/include/installation/scr_switch_debugger.rb new/yast2-installation-3.1.8/src/include/installation/scr_switch_debugger.rb --- old/yast2-installation-3.1.7/src/include/installation/scr_switch_debugger.rb 2013-11-21 11:35:01.000000000 +0100 +++ new/yast2-installation-3.1.8/src/include/installation/scr_switch_debugger.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,835 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. -# -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of version 2 of the GNU General Public License as published by the -# Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, you may find -# current contact information at www.novell.com. -# ------------------------------------------------------------------------------ - -# File: -# include/installation/scr_switch_debugger.ycp -# -# Module: -# System installation -# -# Summary: -# Debugs SCR switch failure -# -# Authors: -# Lukas Ocilka <locilka(a)suse.cz> -# -module Yast - module InstallationScrSwitchDebuggerInclude - def initialize_installation_scr_switch_debugger(include_target) - Yast.import "UI" - textdomain "installation" - - # ATTENTION: This functionality is called when SCR switch fails. - # It means that there is (probably) no other SCR running - # and we have to create one first. - - Yast.import "FileUtils" - Yast.import "Popup" - Yast.import "Label" - Yast.import "Icon" - Yast.import "Installation" - Yast.import "HTML" - Yast.import "String" - - # test result (Checking for xyz... Passed) - @result_ok = _("Passed") - # test result (Checking for xyz... Failed) - @result_failed = _("Failed") - - # ********************************************************************* - - # --> Configuration - - # path of of the failed chroot (SCROpen) - # assigned in main function RunSCRSwitchDebugger() - @chroot_path = nil - - # SCR of the inst-sys - @new_SCR_path = "/" - - # chroot binary - @test_chroot_binary = "/usr/bin/chroot" - - # binary for 'any' command exists - @test_binary_exists = "/bin/ls" - - # any command for the chroot command - @test_do_chroot = "/bin/ls -1 /" - - # get all installed rpm packages - @test_rpm = "rpm -qa" - - # all needed rpm packages, Yast might not be installed at the target system, - # so only glibc seems to be really needed... - @needed_rpm_packages = ["glibc"] - - # is the package %1 installed? - @test_one_rpm = "rpm -q %1" - - # what requires the %1 package? - @test_requires = "rpm -q --requires %1" - - # what provides the %1 object (can contain "()"s) - @test_whatprovides = "rpm -q --whatprovides '%1'" - - # where logs are stored - @yast_logs = "/var/log/YaST2/" - - # YaST log file - @yast_logfile = "y2log" - - @YaST_log_lines = [] - end - - # <-- Configuration - - # ********************************************************************* - - # --> Helper Functions - - # UI dialog - def SCRSwitchDialog - VBox( - Left( - HBox( - HSquash(MarginBox(0.5, 0.2, Icon.Error)), - # heading - Heading(_("Switching to the Installed System Failed")) - ) - ), - VSpacing(0.5), - # informative text - MarginBox( - 1, - 1, - VBox( - Left( - Label( - Builtins.sformat( - # TRANSLATORS: an error message - # %1 - logfile, possibly with errors - # %2 - link to our bugzilla - # %3 - directory where YaST logs are stored - # %4 - link to the Yast Bug Reporting HOWTO Web page - _( - "Switching to the installed system has failed.\n" + - "Find more information near the end of the '%1' file.\n" + - "\n" + - "This is worth reporting a bug at %2.\n" + - "Please, attach all YaST logs stored in the '%3' directory.\n" + - "See %4 for more information about YaST logs.\n" - ), - "/var/log/YaST2/y2log", - "http://bugzilla.novell.com/", - "/var/log/YaST2/", - # link to the Yast Bug Reporting HOWTO - # for translators: use the localized page for your language if it exists, - # check the combo box "In other laguages" on top of the page - _("http://en.opensuse.org/openSUSE:Report_a_YaST_bug") - ) - ) - ) - ) - ), - MarginBox( - 1, - 1, - VBox( - MinWidth( - 70, - # used for progress - LogView( - Id(:log_view), - # log-view label - _("&Checking the Installed System..."), - 18, - 500 - ) - ), - ReplacePoint(Id(:dialog_rp), Empty()) - ) - ) - ) - end - - # reports a progress with reslt - def ReportTest(test_description, test_result) - # report it to the log - Builtins.y2milestone("%1 %2", test_description, test_result) - - # report it to the UI - UI.ChangeWidget( - Id(:log_view), - :LastLine, - Builtins.sformat( - "%1 %2\n", - test_description, - test_result ? @result_ok : @result_failed - ) - ) - - if test_result - # passed - return - end - - Builtins.y2error("-- I.C. Winner --") - - UI.ChangeWidget( - Id(:log_view), - :LastLine, - Ops.add( - Ops.add( - "\n", - Builtins.sformat( - # TRANSLATORS: an error message - # %1 - link to our bugzilla - # %2 - directory where YaST logs are stored - _( - "This is worth reporting a bug at %1.\nPlease, attach all YaST logs stored in the '%2' directory.\n" - ), - "http://bugzilla.novell.com/", - "/var/log/YaST2/" - ) - ), - "\n" - ) - ) - - nil - end - - # report just some progress - def ReportProgress(progress_s) - progress_s = Builtins.sformat("=== %1 ===", progress_s) - - Builtins.y2milestone("%1", progress_s) - UI.ChangeWidget( - Id(:log_view), - :LastLine, - Ops.add(Ops.add("\n", progress_s), "\n") - ) - - nil - end - - # report just a line, no modifications - def ReportLine(line) - Builtins.y2milestone("%1", line) - UI.ChangeWidget(Id(:log_view), :LastLine, Ops.add(line, "\n")) - - nil - end - - # <-- Helper Functions - - # ********************************************************************* - - # --> Tests - - # checks whether the chroot binary exists - def RunSCRSwitchTest_ChrootBinary - test_result = FileUtils.Exists(@test_chroot_binary) - - ReportTest( - # Test progress - Builtins.sformat(_("Checking for %1 binary..."), @test_chroot_binary), - test_result - ) - - test_result - end - - # checks whether the new SCR path exists - def RunSCRSwitchTest_ChrootPath - test_result = FileUtils.IsDirectory(@chroot_path) - - ReportTest( - # Test progress - Builtins.sformat(_("Checking for chroot directory %1..."), @chroot_path), - test_result - ) - - test_result - end - - def RunSCRSwitchTest_ListFilesInChroot - ret = Convert.to_map( - WFM.Execute( - path(".local.bash_output"), - Builtins.sformat("ls -1 '%1'", @chroot_path) - ) - ) - - ReportTest( - # Test progress - Builtins.sformat( - _("Checking for chroot directory content (%1)..."), - Ops.get_string(ret, "stdout", "") - ), - true - ) - - true - end - - # checks whether the new SCR path exists - def RunSCRSwitchTest_BinaryExists - exec_file = Builtins.sformat("%1%2", @chroot_path, @test_binary_exists) - test_result = FileUtils.Exists(exec_file) - - ReportTest( - # Test progress - Builtins.sformat(_("Checking for binary %1..."), exec_file), - test_result - ) - - test_result - end - - # tries to chroot - def RunSCRSwitchTest_DoChroot - test = Convert.convert( - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "%1 %2 %3", # what to execute - @test_chroot_binary, # chroot command - @chroot_path, # where to chroot - @test_do_chroot - ) - ), - :from => "any", - :to => "map <string, any>" - ) - test_result = Ops.get_integer(test, "exit", 42) == 0 - - ReportTest( - # Test progress - _("Trying to chroot..."), - test_result - ) - Builtins.y2milestone( - "Debug: exit>%1<\nstdout>\n%2<\nstderr>%3<", - Ops.get_integer(test, "exit", 0), - Ops.get_string(test, "stdout", ""), - Ops.get_string(test, "stderr", "") - ) - - test_result - end - - def RunSCRSwitchTest_FreeSpace - ReportProgress(_("Checking free space")) - - # Local command - parts_cmd = Convert.to_map( - WFM.Execute( - path(".local.bash_output"), - "mount " + "| grep -v '^\$/proc\$ on' " + - "| sed 's/\\/.* on \$.*\$ type .*/\\1/'" - ) - ) - - partitions = {} - - if Ops.get_integer(parts_cmd, "exit", -1) != 0 - Builtins.y2error("Cannot find out current partitions") - # even if it is an error, we should check more - return true - else - # Spash at the end or not - inst_dir = Ops.add( - Installation.destdir, - Builtins.regexpmatch(Installation.destdir, "/$") ? "" : "/" - ) - inst_dir_length = Builtins.size(inst_dir) - Builtins.y2milestone("InstDir: '%1'", inst_dir) - - Builtins.foreach( - Builtins.splitstring(Ops.get_string(parts_cmd, "stdout", ""), "\n") - ) do |one_partition| - # begin of the one_partition matches the inst_dir - if Builtins.substring(one_partition, 0, inst_dir_length) == inst_dir - # chrooted to the Installation::destdir - Ops.set( - partitions, - Builtins.substring( - one_partition, - Ops.subtract(inst_dir_length, 1) - ), - Convert.to_integer( - SCR.Read(path(".system.freespace"), one_partition) - ) - ) - end - end - end - - Builtins.y2milestone("Partitions: %1", partitions) - - test_result = true - - Builtins.foreach(partitions) do |partition, free_space| - this_test = true - if Ops.less_or_equal(free_space, 0) - test_result = false - this_test = false - end - ReportTest( - Builtins.sformat( - # test result, %1 is replaced with the directory, e.g., /var - # %2 is replaced with the free space in that partition, e.g., 2.8 GB - _("Checking for free space in the %1 directory: %2"), - partition, - # linked to the text above (sometimes replaces the '%2') - Ops.less_than(free_space, 0) ? - _("Unable to find out") : - String.FormatSize(free_space) - ), - this_test - ) - end - - test_result - end - - # tries to get all installed packages from new SCR - def RunSCRSwitchTest_DoRPMCheck - test = Convert.convert( - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "%1 %2 %3", # what to execute - @test_chroot_binary, # chroot command - @chroot_path, # where to chroot - @test_rpm - ) - ), - :from => "any", - :to => "map <string, any>" - ) - test_result = Ops.get_integer(test, "exit", 42) == 0 - - ReportTest( - # Test progress - _("Checking for installed RPM packages..."), - test_result - ) - Builtins.y2milestone( - "Debug: exit>%1<\nstdout>\n%2<\nstderr>%3<", - Ops.get_integer(test, "exit", 0), - Ops.get_string(test, "stdout", ""), - Ops.get_string(test, "stderr", "") - ) - - test_result - end - - # checks whether the RPM is installed in SCR - def RunSCRSwitchTest_CheckWhetherInstalled(package_name) - test_result = nil - ret = true - one_rpm_installed = nil - - one_rpm_installed = Builtins.sformat( - "%1 %2 %3", - @test_chroot_binary, - @chroot_path, - Builtins.sformat(@test_one_rpm, package_name) - ) - - test = Convert.convert( - SCR.Execute(path(".target.bash_output"), one_rpm_installed), - :from => "any", - :to => "map <string, any>" - ) - test_result = Ops.get_integer(test, "exit", -1) == 0 - ret = false if test_result != true - - ReportTest( - # Test progress - Builtins.sformat( - _("Checking whether RPM package %1 is installed..."), - package_name - ), - test_result - ) - Builtins.y2milestone("Debug: %1", test) - - ret - end - - # check which packages are required by needed packages - def RunSCRSwitchTest_DoNeededRPMsRequire(package_name) - test_result = nil - ret = true - - required_packages = Convert.convert( - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "%1 %2 %3", - @test_chroot_binary, - @chroot_path, - Builtins.sformat(@test_requires, package_name) - ) - ), - :from => "any", - :to => "map <string, any>" - ) - test_result = Ops.get_integer(required_packages, "exit", 42) == 0 - ret = false if !test_result - - ReportTest( - # Test progress - Builtins.sformat( - _("Checking what requires RPM package %1..."), - package_name - ), - test_result - ) - - # we have required objects - if test_result - required_packages_s = Ops.get_string(required_packages, "stdout", "") - - already_checked = [] - - # check all required objects (sorted and only once) - Builtins.foreach( - Builtins.toset(Builtins.splitstring(required_packages_s, "\n")) - ) do |one_require| - next if one_require == nil || one_require == "" - # already checked - next if Builtins.contains(already_checked, one_require) - # do not check again - already_checked = Builtins.add(already_checked, one_require) - if Builtins.regexpmatch(one_require, "[ \t]") - one_require = Builtins.regexpsub( - one_require, - "^([^ \t]*)[ \t]", - "\\1" - ) - end - what_provides = Convert.convert( - SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "%1 %2 %3", - @test_chroot_binary, - @chroot_path, - Builtins.sformat(@test_whatprovides, one_require) - ) - ), - :from => "any", - :to => "map <string, any>" - ) - test_result = Ops.get_integer(what_provides, "exit", 42) == 0 - if !test_result - # do not check whether required objects are installed - # if we don't have which they are - raise Break - ret = false - end - what_provides_s = Ops.get_string(what_provides, "stdout", "") - at_least_one = false - # checks whether objects that provides something are installed - Builtins.foreach( - Builtins.toset(Builtins.splitstring(what_provides_s, "\n")) - ) do |one_provides| - next if one_provides == "" - if RunSCRSwitchTest_CheckWhetherInstalled(one_provides) - at_least_one = true - raise Break - else - ret = false - end - end - # none of what_provides is installed - # or nothing provides the requierd object - ret = false if !at_least_one - end - end - - ret - end - - # checks a package, whether it is installed - # if it is installed, whether is has installed requires - def RunSCRSwitchTest_DoNeededRPMsCheck - - # check whether all needed packages are installed - @needed_rpm_packages.sort.all? do |package_name| - # Test progress - ReportProgress( - Builtins.sformat( - _("Running complex check on package %1..."), - package_name - ) - ) - - # is the package installed? all dependencies Ok? - RunSCRSwitchTest_CheckWhetherInstalled(package_name) && RunSCRSwitchTest_DoNeededRPMsRequire(package_name) - end - end - - def PrintLinesFromTo(from_line, to_line) - # start with the first line or further - from_line = 0 if Ops.less_than(from_line, 0) - - # print all lines - Builtins.y2milestone("Logging from: %1 to: %2", from_line, to_line) - - while Ops.less_or_equal(from_line, to_line) - ReportLine(Ops.get(@YaST_log_lines, from_line, "")) - from_line = Ops.add(from_line, 1) - end - - nil - end - - # checks the YaST log on the installed system - def RunSCRSwitchTest_SCRChrootYaSTLog - ret = true - - logfile = Builtins.sformat( - "%1/%2/%3", - Installation.destdir, - @yast_logs, - @yast_logfile - ) - Builtins.y2milestone("Checking file %1", logfile) - - ReportProgress( - Builtins.sformat(_("Checking YaST log file %1..."), logfile) - ) - - _YaST_log = Convert.to_string(WFM.Read(path(".local.string"), logfile)) - - current_line = -1 - - # cannot open YaST log - if _YaST_log == nil - ret = false - ReportTest(_("Opening file..."), ret) - # checking YaST log - else - @YaST_log_lines = Builtins.splitstring(_YaST_log, "\n") - - Builtins.foreach(@YaST_log_lines) do |one_line| - current_line = Ops.add(current_line, 1) - # SCR has died, printing the last 15 lines - if Builtins.regexpmatch(one_line, " Finished YaST.* component ") - ReportLine( - _("SCR process has died, printing the last log lines...") - ) - start_line = Ops.subtract(current_line, 15) - PrintLinesFromTo(start_line, current_line) - - ret = false - raise Break - # YaST got killed - elsif Builtins.regexpmatch(one_line, " got signal ") - # Print just the last line - ReportLine(_("YaST process got killed.")) - PrintLinesFromTo(current_line, current_line) - ret = false - raise Break - end - end - - @YaST_log_lines = [] - - ReportTest(_("Checking YaST log..."), ret) - end - - ret - end - - # main test - def RunSCRSwitchTests - # Test progress - ReportProgress(_("System Checking")) - - return false if !RunSCRSwitchTest_ChrootBinary() - return false if !RunSCRSwitchTest_ChrootPath() - return false if !RunSCRSwitchTest_ListFilesInChroot() - return false if !RunSCRSwitchTest_BinaryExists() - return false if !RunSCRSwitchTest_DoChroot() - return false if !RunSCRSwitchTest_FreeSpace() - return false if !RunSCRSwitchTest_DoRPMCheck() - - # checking all mandatory packages - return false if !RunSCRSwitchTest_DoNeededRPMsCheck() - - return false if !RunSCRSwitchTest_SCRChrootYaSTLog() - - # Add new checks here... - - true - end - - # <-- Tests - - # ********************************************************************* - - # --> Special Functions - - # Copy YaST logs from the just installed system to inst-sys - def CopyY2logsFromSCRToInstSys - # where SCR logs are stored now - scr_logs_directory = Builtins.sformat("%1%2", @chroot_path, @yast_logs) - # where to copy them - copy_to_directory = Builtins.sformat("%1InstalledSystemLogs", @yast_logs) - - command = Builtins.sformat( - "cp -avr '%1' '%2'", - scr_logs_directory, - copy_to_directory - ) - - Builtins.y2milestone( - "Copying YaST logs from the system to inst-sys: %1 -> %2", - command, - WFM.Execute(path(".local.bash_output"), command) - ) - - nil - end - - def FindSCRPID - cmd = Convert.to_map( - WFM.Execute( - path(".local.bash_output"), - "LC_ALL=C /bin/ps a | grep 'scr stdio' | grep -v 'grep'" - ) - ) - - if Ops.get_integer(cmd, "exit", -1) != 0 - Builtins.y2error("Cannot find scr process") - return -1 - end - - outlines = Builtins.filter( - Builtins.splitstring(Ops.get_string(cmd, "stdout", ""), "\n") - ) { |one_outline| one_outline != "" } - outline = Ops.get(outlines, Ops.subtract(Builtins.size(outlines), 1), "") - - if !Builtins.regexpmatch(outline, "^[[:digit:]]+") - Builtins.y2error("No PID in %1", outline) - return -1 - end - - outline = Builtins.regexpsub( - outline, - "^([[:digit:]]+)[[:space:]].*", - "\\1" - ) - - ret = Builtins.tointeger(outline) - Builtins.y2milestone("SCR PID: %1", ret) - - ret - end - - # This is potentially insecure - def SwitchY2Debug(_PID) - if _PID == nil - Builtins.y2error("PID cannot be: %1", _PID) - return - end - - cmd = Builtins.sformat("kill -s USR1 %1", _PID) - - Builtins.y2milestone( - "Adjusting Y2DEBUG >%1<: %2", - cmd, - WFM.Execute(path(".local.bash_output"), cmd) - ) - - nil - end - - # <-- Special Functions - - # ********************************************************************* - - # Function debugs why the SCR switch failed and reports - # it to user. - # - # @param string failed_chroot_chroot - def RunSCRSwitchDebugger(failed_chroot_path) - if failed_chroot_path == nil - Builtins.y2error("Chroot path not defined!") - # popup error - Popup.Error(_("Unknown chroot path. The debugger cannot continue.")) - return - end - # will be used for all chroot calls later - @chroot_path = failed_chroot_path - - # if any SCR exists - old_SCR = WFM.SCRGetDefault - new_SCR = WFM.SCROpen( - Ops.add(Ops.add("chroot=", @new_SCR_path), ":scr"), - false - ) - if Ops.less_than(new_SCR, 0) - Builtins.y2error("Cannot conenct to SCR %1", @new_SCR_path) - Popup.Error( - _("Connecting to the inst-sys failed. Debugger cannot continue.") - ) - return - end - # Set the new SCR as a defalt one - WFM.SCRSetDefault(new_SCR) - - # Copy all YaST log files from SCR to Inst-Sys - # before SCR test - CopyY2logsFromSCRToInstSys() - - Builtins.y2milestone("* ---------- Debugger Start ---------- *") - - UI.OpenDialog(SCRSwitchDialog()) - RunSCRSwitchTests() - UI.ReplaceWidget(Id(:dialog_rp), PushButton(Id(:ok), Label.OKButton)) - ret = nil - while ret != :ok - ret = UI.UserInput - end - UI.CloseDialog - - Builtins.y2milestone("* ---------- Debugger Finish ---------- *") - - # Close the SCR created for testing - WFM.SCRClose(new_SCR) - # Set the previous one as the default - WFM.SCRSetDefault(old_SCR) - - # Copy all YaST log files from SCR to Inst-Sys - # after SCR tests - CopyY2logsFromSCRToInstSys() - - nil - end - end -end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-psutil for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package python-psutil for openSUSE:Factory checked in at 2013-11-28 19:05:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psutil (Old) and /work/SRC/openSUSE:Factory/.python-psutil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-psutil" Changes: -------- --- /work/SRC/openSUSE:Factory/python-psutil/python-psutil.changes 2013-10-21 20:02:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-psutil.new/python-psutil.changes 2013-11-28 19:05:07.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Nov 27 21:26:26 UTC 2013 - p.drouand(a)gmail.com + +- Update to version 1.2.1 + * #348: [Windows XP] fixed "ImportError: DLL load failed" occurring + on module import. + * #425: [Solaris] crash on import due to failure at determining BOOT_TIME. + * #443: [Linux] can't set CPU affinity with systems with more than 64 cores. +- Changes from version 1.2.0 + * #439: assume os.getpid() if no argument is passed to psutil.Process + constructor. + * #440: new psutil.wait_procs() utility function which waits for multiple + processes to terminate. + * #348: [Windows XP/Vista] fixed "ImportError: DLL load failed" occurring on + module import. +- Changes from version 1.1.3 + * #442: [Linux] psutil won't compile on certain version of Linux because of + missing prlimit(2) syscall. +- Changes from version 1.1.2 + * #442: [Linux] psutil won't compile on Debian 6.0 because of missing + prlimit(2) syscall. + +------------------------------------------------------------------- Old: ---- psutil-1.1.1.tar.gz New: ---- psutil-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psutil.spec ++++++ --- /var/tmp/diff_new_pack.9MEQUw/_old 2013-11-28 19:05:08.000000000 +0100 +++ /var/tmp/diff_new_pack.9MEQUw/_new 2013-11-28 19:05:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-psutil -Version: 1.1.1 +Version: 1.2.1 Release: 0 Summary: A process utilities module for Python License: BSD-3-Clause ++++++ psutil-1.1.1.tar.gz -> psutil-1.2.1.tar.gz ++++++ ++++ 4292 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-pecan for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package python-pecan for openSUSE:Factory checked in at 2013-11-28 19:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pecan (Old) and /work/SRC/openSUSE:Factory/.python-pecan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pecan" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pecan/python-pecan.changes 2013-09-23 11:17:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pecan.new/python-pecan.changes 2013-11-28 19:03:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 28 15:07:14 UTC 2013 - dmueller(a)suse.com + +- package LICENSE and README.rst + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pecan.spec ++++++ --- /var/tmp/diff_new_pack.6HvMj4/_old 2013-11-28 19:03:53.000000000 +0100 +++ /var/tmp/diff_new_pack.6HvMj4/_new 2013-11-28 19:03:53.000000000 +0100 @@ -73,6 +73,7 @@ %files %defattr(-,root,root,-) +%doc LICENSE README.rst %{_bindir}/pecan %{_bindir}/gunicorn_pecan %{python_sitelib}/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-JSON for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package perl-JSON for openSUSE:Factory checked in at 2013-11-28 18:52:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-JSON (Old) and /work/SRC/openSUSE:Factory/.perl-JSON.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-JSON" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-JSON/perl-JSON.changes 2013-06-13 17:42:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-JSON.new/perl-JSON.changes 2013-11-28 18:52:12.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Nov 26 07:28:28 UTC 2013 - coolo(a)suse.com + +- updated to 2.90 + +CAUTION!!! + INCOMPATIBLE CHANGE + + JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally + on loading time for making these modules inherit JSON::Boolean. + But since JSON::XS v3.0 it use Types::Serialiser as boolean class. + Then now JSON.pm breaks boolean classe overload features and + -support_by_pp if JSON::XS v3.0 or later is installed. + + JSON::true and JSON::false returned JSON::Boolean objects. + For workaround, they return JSON::PP::Boolean objects in this version. + + isa_ok(JSON::true, 'JSON::PP::Boolean'); + + And it discards a feature: + + ok(JSON::true eq 'true'); + + In other word, JSON::PP::Boolean overload numeric only. + + ok( JSON::true == 1 ); + +------------------------------------------------------------------- Old: ---- JSON-2.59.tar.gz New: ---- JSON-2.90.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-JSON.spec ++++++ --- /var/tmp/diff_new_pack.WLiqm6/_old 2013-11-28 18:52:13.000000000 +0100 +++ /var/tmp/diff_new_pack.WLiqm6/_new 2013-11-28 18:52:13.000000000 +0100 @@ -17,7 +17,7 @@ Name: perl-JSON -Version: 2.59 +Version: 2.90 Release: 0 %define cpan_name JSON Summary: JSON (JavaScript Object Notation) encoder/decoder @@ -29,10 +29,41 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +#BuildRequires: perl(JSON) +#BuildRequires: perl(JSON::backportPP) +#BuildRequires: perl(JSON::PP) +#BuildRequires: perl(JSON::XS) +#BuildRequires: perl(Tie::IxHash) +#BuildRequires: perl(_unicode_handling) Recommends: perl(JSON::XS) >= 2.34 %{perl_requires} %description + *************************** CAUTION ************************************** + * * + * INCOMPATIBLE CHANGE (JSON::XS version 2.90) * + * * + * JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally * + * on loading time for making these modules inherit JSON::Boolean. * + * But since JSON::XS v3.0 it use Types::Serialiser as boolean class. * + * Then now JSON.pm breaks boolean classe overload features and * + * -support_by_pp if JSON::XS v3.0 or later is installed. * + * * + * JSON::true and JSON::false returned JSON::Boolean objects. * + * For workaround, they return JSON::PP::Boolean objects in this version. * + * * + * isa_ok(JSON::true, 'JSON::PP::Boolean'); * + * * + * And it discards a feature: * + * * + * ok(JSON::true eq 'true'); * + * * + * In other word, JSON::PP::Boolean overload numeric only. * + * * + * ok( JSON::true == 1 ); * + * * + ************************************************************************** + ************************** CAUTION ******************************** * This is 'JSON module version 2' and there are many differences * * to version 1.xx * ++++++ JSON-2.59.tar.gz -> JSON-2.90.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/Changes new/JSON-2.90/Changes --- old/JSON-2.59/Changes 2013-06-05 08:04:55.000000000 +0200 +++ new/JSON-2.90/Changes 2013-10-31 11:36:05.000000000 +0100 @@ -1,18 +1,61 @@ Revision history for Perl extension JSON. -## JSON version 2.xx ##################################################### +## JSON version 2.9 ##################################################### -From version 1.xx to 2.xx, JSON was totally rewritten. +CAUTION!!! +INCOMPATIBLE CHANGE - * JSON becomes a wrapper to JSON::XS or JSON::PP! - * objToJson() and jsonToObj() are obsoleted! - * $JSON::* variables are no longer available! - * JSON::Parser and JSON::Converter are deleted from the distribution! - * JSONRPC* and Apache::JSONRPC are deleted from the distribution! - Please check JSON::RPC (supports JSON-RPC protocol v1.1 and 1.0). +JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally +on loading time for making these modules inherit JSON::Boolean. +But since JSON::XS v3.0 it use Types::Serialiser as boolean class. +Then now JSON.pm breaks boolean classe overload features and +-support_by_pp if JSON::XS v3.0 or later is installed. + +JSON::true and JSON::false returned JSON::Boolean objects. +For workaround, they return JSON::PP::Boolean objects in this version. + + isa_ok(JSON::true, 'JSON::PP::Boolean'); + +And it discards a feature: + + ok(JSON::true eq 'true'); + +In other word, JSON::PP::Boolean overload numeric only. + + ok( JSON::true == 1 ); ########################################################################## +2.90 Wed Oct 30 19:48:43 2013 + + **** Please see to the headline in this file. **** + + - workaround for JSON::XS version 3.0 or later installed case. + + * the objects returned by JSON::true/false are JSON::PP::Boolean. + * they do not overload 'eq'. + + - changed test cases for this patch. + + t/e02_bool.t + t/e03_bool2.t + t/x17_strange_overload.t + t/xe02_bool.t + t/xe03_bool2.t + t/xe12_boolean.t + + **** Please see to the headline in this file. **** + + +2.61 Thu Oct 17 19:38:55 2013 + - fixed return/or in _incr_parse + reported and patched by MAUKE, sprout and rjbs + https://rt.cpan.org/Public/Bug/Display.html?id=86948 + +2.60 + - $json->is_xs, $json->is_pp was completely broken. + pointed by rt#75867 and emceelam + 2.59 Wed Jun 5 14:35:54 2013 - PUREPERL_ONLY support was not supported... and finally remove all PP options from Makefile.PL. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/MANIFEST new/JSON-2.90/MANIFEST --- old/JSON-2.59/MANIFEST 2013-06-05 08:33:14.000000000 +0200 +++ new/JSON-2.90/MANIFEST 2013-10-31 11:38:22.000000000 +0100 @@ -68,4 +68,5 @@ t/xe12_boolean.t t/xe19_xs_and_suportbypp.t t/xe20_croak_message.t +t/xe21_is_pp.t META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/META.json new/JSON-2.90/META.json --- old/JSON-2.59/META.json 2013-06-05 08:33:14.000000000 +0200 +++ new/JSON-2.90/META.json 2013-10-31 11:38:21.000000000 +0100 @@ -45,5 +45,5 @@ "url" : "https://github.com/makamaka/JSON" } }, - "version" : "2.59" + "version" : "2.90" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/META.yml new/JSON-2.90/META.yml --- old/JSON-2.59/META.yml 2013-06-05 08:33:14.000000000 +0200 +++ new/JSON-2.90/META.yml 2013-10-31 11:38:21.000000000 +0100 @@ -23,4 +23,4 @@ Test::More: 0 resources: repository: https://github.com/makamaka/JSON -version: 2.59 +version: 2.90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/Makefile.PL new/JSON-2.90/Makefile.PL --- old/JSON-2.59/Makefile.PL 2013-06-05 07:50:29.000000000 +0200 +++ new/JSON-2.90/Makefile.PL 2013-10-31 11:36:05.000000000 +0100 @@ -29,6 +29,32 @@ ============================= $message + *************************** CAUTION ************************************** + * * + * INCOMPATIBLE CHANGE (JSON::XS version 2.90) * + * * + * JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally * + * on loading time for making these modules inherit JSON::Boolean. * + * But since JSON::XS v3.0 it use Types::Serialiser as boolean class. * + * Then now JSON.pm breaks boolean classe overload features and * + * -support_by_pp if JSON::XS v3.0 or later is installed. * + * * + * JSON::true and JSON::false returned JSON::Boolean objects. * + * For workaround, they return JSON::PP::Boolean objects in this version. * + * * + * isa_ok(JSON::true, 'JSON::PP::Boolean'); * + * * + * And it discards a feature: * + * * + * ok(JSON::true eq 'true'); * + * * + * In other word, JSON::PP::Boolean overload numeric only. * + * * + * ok( JSON::true == 1 ); * + * * + ************************************************************************** + + ************************** CAUTION ************************** * This is 'JSON version 2' and there are many differences * * to version 1.xx * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/README new/JSON-2.90/README --- old/JSON-2.59/README 2013-06-05 07:50:29.000000000 +0200 +++ new/JSON-2.90/README 2013-10-31 11:36:05.000000000 +0100 @@ -64,9 +64,10 @@ # recommend to use (en|de)code_json. VERSION - 2.58 + 2.90 - This version is compatible with JSON::XS 2.27 and later. + This version is compatible with JSON::XS 2.34 and later. + (Not yet compatble to JSON::XS B<3.0x>.) NOTE JSON::PP was earlier included in the "JSON" distribution, but has since @@ -82,6 +83,31 @@ backwards computability. JSON.pm should thus work as it did before. DESCRIPTION + *************************** CAUTION ************************************** + * * + * INCOMPATIBLE CHANGE (JSON::XS version 2.90) * + * * + * JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally * + * on loading time for making these modules inherit JSON::Boolean. * + * But since JSON::XS v3.0 it use Types::Serialiser as boolean class. * + * Then now JSON.pm breaks boolean classe overload features and * + * -support_by_pp if JSON::XS v3.0 or later is installed. * + * * + * JSON::true and JSON::false returned JSON::Boolean objects. * + * For workaround, they return JSON::PP::Boolean objects in this version. * + * * + * isa_ok(JSON::true, 'JSON::PP::Boolean'); * + * * + * And it discards a feature: * + * * + * ok(JSON::true eq 'true'); * + * * + * In other word, JSON::PP::Boolean overload numeric only. * + * * + * ok( JSON::true == 1 ); * + * * + ************************************************************************** + ************************** CAUTION ******************************** * This is 'JSON module version 2' and there are many differences * * to version 1.xx * @@ -1146,15 +1172,9 @@ numbers 1 and 0. You can check whether a scalar is a JSON boolean by using the "JSON::is_bool" function. - If "JSON::true" and "JSON::false" are used as strings or compared as - strings, they represent as "true" and "false" respectively. - - print JSON::true . "\n"; - => true print JSON::true + 1; => 1 - ok(JSON::true eq 'true'); ok(JSON::true eq '1'); ok(JSON::true == 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/lib/JSON/backportPP.pm new/JSON-2.90/lib/JSON/backportPP.pm --- old/JSON-2.59/lib/JSON/backportPP.pm 2013-05-23 06:37:21.000000000 +0200 +++ new/JSON-2.90/lib/JSON/backportPP.pm 2013-10-31 11:36:05.000000000 +0100 @@ -13,7 +13,7 @@ #use Devel::Peek; use vars qw($VERSION); -$VERSION = '2.27202'; +$VERSION = '2.27204'; @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json); @@ -1394,8 +1394,22 @@ # shamelessly copied and modified from JSON::XS code. -$JSON::PP::true = do { bless \(my $dummy = 1), "JSON::backportPP::Boolean" }; -$JSON::PP::false = do { bless \(my $dummy = 0), "JSON::backportPP::Boolean" }; +unless ( $INC{'JSON/PP.pm'} ) { + eval q| + package + JSON::PP::Boolean; + + use overload ( + "0+" => sub { ${$_[0]} }, + "++" => sub { $_[0] = ${$_[0]} + 1 }, + "--" => sub { $_[0] = ${$_[0]} - 1 }, + fallback => 1, + ); + |; +} + +$JSON::PP::true = do { bless \(my $dummy = 1), "JSON::PP::Boolean" }; +$JSON::PP::false = do { bless \(my $dummy = 0), "JSON::PP::Boolean" }; sub is_bool { defined $_[0] and UNIVERSAL::isa($_[0], "JSON::PP::Boolean"); } @@ -1405,17 +1419,6 @@ ############################### -package JSON::backportPP::Boolean; - -@JSON::backportPP::Boolean::ISA = ('JSON::PP::Boolean'); -use overload ( - "0+" => sub { ${$_[0]} }, - "++" => sub { $_[0] = ${$_[0]} + 1 }, - "--" => sub { $_[0] = ${$_[0]} - 1 }, - fallback => 1, -); - - ############################### package # hide from PAUSE @@ -1570,7 +1573,7 @@ $self->{incr_text} = substr( $self->{incr_text}, $p ); $self->{incr_p} = 0; - return $obj or ''; + return $obj || ''; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/lib/JSON.pm new/JSON-2.90/lib/JSON.pm --- old/JSON-2.59/lib/JSON.pm 2013-06-05 07:50:29.000000000 +0200 +++ new/JSON-2.90/lib/JSON.pm 2013-10-31 11:36:05.000000000 +0100 @@ -7,7 +7,7 @@ @JSON::EXPORT = qw(from_json to_json jsonToObj objToJson encode_json decode_json); BEGIN { - $JSON::VERSION = '2.59'; + $JSON::VERSION = '2.90'; $JSON::DEBUG = 0 unless (defined $JSON::DEBUG); $JSON::DEBUG = $ENV{ PERL_JSON_DEBUG } if exists $ENV{ PERL_JSON_DEBUG }; } @@ -15,7 +15,7 @@ my $Module_XS = 'JSON::XS'; my $Module_PP = 'JSON::PP'; my $Module_bp = 'JSON::backportPP'; # included in JSON distribution -my $PP_Version = '2.27200'; +my $PP_Version = '2.27203'; my $XS_Version = '2.34'; @@ -32,7 +32,7 @@ allow_blessed convert_blessed shrink max_depth max_size allow_unknown /; -my @XSOnlyMethods = qw//; # Currently nothing +my @XSOnlyMethods = qw/allow_tags/; # Currently nothing my @PPOnlyMethods = qw/ indent_length sort_by @@ -172,6 +172,7 @@ } + sub true { $JSON::true } sub false { $JSON::false } @@ -190,12 +191,12 @@ sub is_xs { - return $_[0]->module eq $Module_XS; + return $_[0]->backend eq $Module_XS; } sub is_pp { - return not $_[0]->xs; + return not $_[0]->is_xs; } @@ -321,7 +322,10 @@ $JSON::false = ${"$module\::false"}; push @JSON::ISA, $module; - push @{"$module\::Boolean::ISA"}, qw(JSON::Boolean); + if ( JSON->is_xs and JSON->backend->VERSION < 3 ) { + eval 'package JSON::PP::Boolean'; + push @{"$module\::Boolean::ISA"}, qw(JSON::PP::Boolean); + } *{"JSON::is_bool"} = \&{"$module\::is_bool"}; @@ -346,6 +350,7 @@ my %Installed; sub _overrride_overload { + return; # this function is currently disable. return if ($Installed{ $_[0] }++); my $boolean = $_[0] . '::Boolean'; @@ -486,8 +491,8 @@ $pkg->_make_unsupported_method($method => $type); } - push @{"JSON::XS::Boolean::ISA"}, qw(JSON::PP::Boolean); - push @{"JSON::PP::Boolean::ISA"}, qw(JSON::Boolean); +# push @{"JSON::XS::Boolean::ISA"}, qw(JSON::PP::Boolean); +# push @{"JSON::PP::Boolean::ISA"}, qw(JSON::Boolean); $JSON::DEBUG and Carp::carp("set -support_by_pp mode."); @@ -655,9 +660,10 @@ =head1 VERSION - 2.59 + 2.90 This version is compatible with JSON::XS B<2.34> and later. +(Not yet compatble to JSON::XS B<3.0x>.) =head1 NOTE @@ -681,6 +687,31 @@ =head1 DESCRIPTION + *************************** CAUTION ************************************** + * * + * INCOMPATIBLE CHANGE (JSON::XS version 2.90) * + * * + * JSON.pm had patched JSON::XS::Boolean and JSON::PP::Boolean internally * + * on loading time for making these modules inherit JSON::Boolean. * + * But since JSON::XS v3.0 it use Types::Serialiser as boolean class. * + * Then now JSON.pm breaks boolean classe overload features and * + * -support_by_pp if JSON::XS v3.0 or later is installed. * + * * + * JSON::true and JSON::false returned JSON::Boolean objects. * + * For workaround, they return JSON::PP::Boolean objects in this version. * + * * + * isa_ok(JSON::true, 'JSON::PP::Boolean'); * + * * + * And it discards a feature: * + * * + * ok(JSON::true eq 'true'); * + * * + * In other word, JSON::PP::Boolean overload numeric only. * + * * + * ok( JSON::true == 1 ); * + * * + ************************************************************************** + ************************** CAUTION ******************************** * This is 'JSON module version 2' and there are many differences * * to version 1.xx * @@ -1798,15 +1829,9 @@ C<1> and C<0>. You can check whether a scalar is a JSON boolean by using the C<JSON::is_bool> function. -If C<JSON::true> and C<JSON::false> are used as strings or compared as strings, -they represent as C<true> and C<false> respectively. - - print JSON::true . "\n"; - => true print JSON::true + 1; => 1 - ok(JSON::true eq 'true'); ok(JSON::true eq '1'); ok(JSON::true == 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/e02_bool.t new/JSON-2.90/t/e02_bool.t --- old/JSON-2.59/t/e02_bool.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/e02_bool.t 2013-10-31 11:36:05.000000000 +0100 @@ -1,33 +1,34 @@ -#!/usr/bin/perl -w - -use strict; - -use Test::More; -use strict; - -BEGIN { plan tests => 11 }; - -BEGIN { $ENV{PERL_JSON_BACKEND} = "JSON::backportPP"; } - -use JSON; - -my $json = new JSON; - - -is($json->encode([!1]), '[""]'); -is($json->encode([!!2]), '["1"]'); - -is($json->encode([ 'a' eq 'b' ]), '[""]'); -is($json->encode([ 'a' eq 'a' ]), '["1"]'); - -is($json->encode([ ('a' eq 'b') + 1 ]), '[1]'); -is($json->encode([ ('a' eq 'a') + 1 ]), '[2]'); - -ok(JSON::true eq 'true'); -ok(JSON::true eq '1'); -ok(JSON::true == 1); -isa_ok(JSON::true, JSON->backend . '::Boolean'); -isa_ok(JSON::true, 'JSON::Boolean'); - - - +#!/usr/bin/perl -w + +use strict; + +use Test::More; +use strict; + +BEGIN { plan tests => 8 }; + +BEGIN { $ENV{PERL_JSON_BACKEND} = "JSON::backportPP"; } + +use JSON; + +my $json = new JSON; + + +is($json->encode([!1]), '[""]'); +is($json->encode([!!2]), '["1"]'); + +is($json->encode([ 'a' eq 'b' ]), '[""]'); +is($json->encode([ 'a' eq 'a' ]), '["1"]'); + +is($json->encode([ ('a' eq 'b') + 1 ]), '[1]'); +is($json->encode([ ('a' eq 'a') + 1 ]), '[2]'); + +# discard overload hack for JSON::XS 3.0 boolean class +#ok(JSON::true eq 'true'); +#ok(JSON::true eq '1'); +ok(JSON::true == 1); +isa_ok(JSON::true, 'JSON::PP::Boolean'); +#isa_ok(JSON::true, 'JSON::Boolean'); + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/e03_bool2.t new/JSON-2.90/t/e03_bool2.t --- old/JSON-2.59/t/e03_bool2.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/e03_bool2.t 2013-10-31 11:36:05.000000000 +0100 @@ -1,6 +1,6 @@ use Test::More; -BEGIN { plan tests => 26 }; +BEGIN { plan tests => 16 }; BEGIN { $ENV{PERL_JSON_BACKEND} = "JSON::backportPP"; } use JSON; @@ -11,30 +11,30 @@ my $jsontext = q|[true,false,null]|; my $obj = from_json($jsontext); - -isa_ok($obj->[0], 'JSON::Boolean'); -isa_ok($obj->[1], 'JSON::Boolean'); +#push @JSON::backportPP::Boolean::ISA, 'JSON::Boolean'; +isa_ok($obj->[0], 'JSON::PP::Boolean'); +isa_ok($obj->[1], 'JSON::PP::Boolean'); ok(!defined $obj->[2], 'null is undef'); ok($obj->[0] == 1); ok($obj->[0] != 0); ok($obj->[1] == 0); ok($obj->[1] != 1); - -ok($obj->[0] eq 'true', 'eq true'); -ok($obj->[0] ne 'false', 'ne false'); -ok($obj->[1] eq 'false', 'eq false'); -ok($obj->[1] ne 'true', 'ne true'); +# discard overload hack for JSON::XS 3.0 boolean class +#ok($obj->[0] eq 'true', 'eq true'); +#ok($obj->[0] ne 'false', 'ne false'); +#ok($obj->[1] eq 'false', 'eq false'); +#ok($obj->[1] ne 'true', 'ne true'); ok($obj->[0] eq $obj->[0]); ok($obj->[0] ne $obj->[1]); -ok(JSON::true eq 'true'); -ok(JSON::true ne 'false'); -ok(JSON::true ne 'null'); -ok(JSON::false eq 'false'); -ok(JSON::false ne 'true'); -ok(JSON::false ne 'null'); +#ok(JSON::true eq 'true'); +#ok(JSON::true ne 'false'); +#ok(JSON::true ne 'null'); +#ok(JSON::false eq 'false'); +#ok(JSON::false ne 'true'); +#ok(JSON::false ne 'null'); ok(!defined JSON::null); is(from_json('[true]' )->[0], JSON::true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/x00_load.t new/JSON-2.90/t/x00_load.t --- old/JSON-2.59/t/x00_load.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/x00_load.t 2013-10-31 11:36:05.000000000 +0100 @@ -9,6 +9,7 @@ SKIP: { skip "can't use JSON::XS.", 1, unless( JSON->backend->is_xs ); - ok(1, "load JSON::XS"); + diag("load JSON::XS v." . JSON->backend->VERSION ); + ok(1, "load JSON::XS v." . JSON->backend->VERSION ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/x17_strange_overload.t new/JSON-2.90/t/x17_strange_overload.t --- old/JSON-2.59/t/x17_strange_overload.t 2013-04-06 08:34:12.000000000 +0200 +++ new/JSON-2.90/t/x17_strange_overload.t 2013-10-31 11:36:05.000000000 +0100 @@ -5,6 +5,8 @@ BEGIN { $ENV{PERL_JSON_BACKEND} = 1; } SKIP: { + skip "for JSON::XS 3.x. cimpatible. Please see to Changes.", 2; + eval q{ use JSON::XS; use JSON (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/xe02_bool.t new/JSON-2.90/t/xe02_bool.t --- old/JSON-2.59/t/xe02_bool.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/xe02_bool.t 2013-10-31 11:36:05.000000000 +0100 @@ -1,34 +1,34 @@ -#!/usr/bin/perl -w - -use strict; - -use Test::More; -use strict; - -BEGIN { plan tests => 11 }; - -BEGIN { $ENV{PERL_JSON_BACKEND} = 1; } - -use JSON; - -SKIP: { - skip "can't use JSON::XS.", 11, unless( JSON->backend->is_xs ); - -my $json = new JSON; - -is($json->encode([!1]), '[""]'); -is($json->encode([!!2]), '["1"]'); - -is($json->encode([ 'a' eq 'b' ]), '[""]'); -is($json->encode([ 'a' eq 'a' ]), '["1"]'); - -is($json->encode([ ('a' eq 'b') + 1 ]), '[1]'); -is($json->encode([ ('a' eq 'a') + 1 ]), '[2]'); - -ok(JSON::true eq 'true'); -ok(JSON::true eq '1'); -ok(JSON::true == 1); -isa_ok(JSON::true, JSON->backend . '::Boolean'); -isa_ok(JSON::true, 'JSON::Boolean'); - -} +#!/usr/bin/perl -w + +use strict; + +use Test::More; +use strict; + +BEGIN { plan tests => 8 }; + +BEGIN { $ENV{PERL_JSON_BACKEND} = 1; } + +use JSON; + +SKIP: { + skip "can't use JSON::XS.", 8, unless( JSON->backend->is_xs ); + +my $json = new JSON; + +is($json->encode([!1]), '[""]'); +is($json->encode([!!2]), '["1"]'); + +is($json->encode([ 'a' eq 'b' ]), '[""]'); +is($json->encode([ 'a' eq 'a' ]), '["1"]'); + +is($json->encode([ ('a' eq 'b') + 1 ]), '[1]'); +is($json->encode([ ('a' eq 'a') + 1 ]), '[2]'); + +# discard overload hack for JSON::XS 3.0 boolean class +#ok(JSON::true eq 'true'); +#ok(JSON::true eq '1'); +ok(JSON::true == 1); +isa_ok(JSON::true, 'JSON::PP::Boolean'); + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/xe03_bool2.t new/JSON-2.90/t/xe03_bool2.t --- old/JSON-2.59/t/xe03_bool2.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/xe03_bool2.t 2013-10-31 11:36:05.000000000 +0100 @@ -1,12 +1,12 @@ use Test::More; -BEGIN { plan tests => 26 }; +BEGIN { plan tests => 16 }; BEGIN { $ENV{PERL_JSON_BACKEND} = 1; } use JSON; SKIP: { - skip "can't use JSON::XS.", 26, unless( JSON->backend->is_xs ); + skip "can't use JSON::XS.", 16, unless( JSON->backend->is_xs ); is(to_json([JSON::true]), q|[true]|); is(to_json([JSON::false]), q|[false]|); @@ -15,8 +15,8 @@ my $jsontext = q|[true,false,null]|; my $obj = from_json($jsontext); -isa_ok($obj->[0], 'JSON::Boolean'); -isa_ok($obj->[1], 'JSON::Boolean'); +isa_ok($obj->[0], 'JSON::PP::Boolean'); +isa_ok($obj->[1], 'JSON::PP::Boolean'); ok(!defined $obj->[2], 'null is undef'); ok($obj->[0] == 1); @@ -24,20 +24,20 @@ ok($obj->[1] == 0); ok($obj->[1] != 1); -ok($obj->[0] eq 'true', 'eq true'); -ok($obj->[0] ne 'false', 'ne false'); -ok($obj->[1] eq 'false', 'eq false'); -ok($obj->[1] ne 'true', 'ne true'); +#ok($obj->[0] eq 'true', 'eq true'); +#ok($obj->[0] ne 'false', 'ne false'); +#ok($obj->[1] eq 'false', 'eq false'); +#ok($obj->[1] ne 'true', 'ne true'); ok($obj->[0] eq $obj->[0]); ok($obj->[0] ne $obj->[1]); -ok(JSON::true eq 'true'); -ok(JSON::true ne 'false'); -ok(JSON::true ne 'null'); -ok(JSON::false eq 'false'); -ok(JSON::false ne 'true'); -ok(JSON::false ne 'null'); +#ok(JSON::true eq 'true'); +#ok(JSON::true ne 'false'); +#ok(JSON::true ne 'null'); +#ok(JSON::false eq 'false'); +#ok(JSON::false ne 'true'); +#ok(JSON::false ne 'null'); ok(!defined JSON::null); is(from_json('[true]' )->[0], JSON::true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/xe12_boolean.t new/JSON-2.90/t/xe12_boolean.t --- old/JSON-2.59/t/xe12_boolean.t 2011-10-26 04:10:15.000000000 +0200 +++ new/JSON-2.90/t/xe12_boolean.t 2013-10-31 11:36:05.000000000 +0100 @@ -21,13 +21,13 @@ my $bool = $json->allow_nonref->decode('true'); # it's normal -isa_ok( $bool, 'JSON::Boolean' ); +isa_ok( $bool, 'JSON::PP::Boolean' ); is( $json->encode([ JSON::true ]), '[true]' ); # make XS non support flag enable! $bool = $json->allow_singlequote->decode('true'); -isa_ok( $bool, 'JSON::Boolean' ); +isa_ok( $bool, 'JSON::PP::Boolean' ); is( $json->encode([ JSON::true ]), '[true]' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/JSON-2.59/t/xe21_is_pp.t new/JSON-2.90/t/xe21_is_pp.t --- old/JSON-2.59/t/xe21_is_pp.t 1970-01-01 01:00:00.000000000 +0100 +++ new/JSON-2.90/t/xe21_is_pp.t 2013-06-06 05:05:26.000000000 +0200 @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w + +use strict; +use Test::More; + +BEGIN { plan tests => 5 }; + +BEGIN { + $ENV{PERL_JSON_BACKEND} = 1; +} + +use JSON; + +my $json = JSON->new(); + +ok( $json->backend, 'backend is ' . $json->backend ); + +if ( $json->backend->is_xs ) { + ok (!JSON->is_pp(), 'JSON->is_pp()'); + ok ( JSON->is_xs(), 'JSON->is_xs()'); + ok (!$json->is_pp(), '$json->is_pp()'); + ok ( $json->is_xs(), '$json->is_xs()'); +} +else { + ok ( JSON->is_pp(), 'JSON->is_pp()'); + ok (!JSON->is_xs(), 'JSON->is_xs()'); + ok ( $json->is_pp(), '$json->is_pp()'); + ok (!$json->is_xs(), '$json->is_xs()'); +} + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openexr for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package openexr for openSUSE:Factory checked in at 2013-11-28 18:52:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openexr (Old) and /work/SRC/openSUSE:Factory/.openexr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openexr" Changes: -------- --- /work/SRC/openSUSE:Factory/openexr/openexr.changes 2013-11-28 07:38:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openexr.new/openexr.changes 2013-11-28 18:52:06.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 28 10:22:05 UTC 2013 - toganm(a)opensuse.org + +- add openexr-2.1.0-headers.patch to install + ImfDeepImageStateAttribute.h header too + +------------------------------------------------------------------- New: ---- openexr-2.1.0-headers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openexr.spec ++++++ --- /var/tmp/diff_new_pack.vnnJxy/_old 2013-11-28 18:52:07.000000000 +0100 +++ /var/tmp/diff_new_pack.vnnJxy/_new 2013-11-28 18:52:07.000000000 +0100 @@ -46,6 +46,8 @@ Source1: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar… Source2: baselibs.conf Source3: openexr.keyring +# PATCH-FIX-UPSTREAM install ImfDeepImageStateAttribute.h header too Rex Dieter<rdieter(a)math.unl.edu> +Patch0: openexr-2.1.0-headers.patch %description OpenEXR is a high dynamic-range (HDR) image file format developed by @@ -113,6 +115,8 @@ %{?gpg_verify: %gpg_verify %{S:1}} %setup -q +%patch0 -p1 + # poor man's fdupes if cmp COPYING LICENSE; then rm -rf LICENSE ++++++ openexr-2.1.0-headers.patch ++++++ diff -up openexr-2.1.0/IlmImf/Makefile.am.headers openexr-2.1.0/IlmImf/Makefile.am --- openexr-2.1.0/IlmImf/Makefile.am.headers 2013-11-11 17:09:51.000000000 -0600 +++ openexr-2.1.0/IlmImf/Makefile.am 2013-11-27 11:33:11.934497336 -0600 @@ -103,6 +103,7 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfCRgbaFile.h ImfChannelList.h \ ImfChannelListAttribute.h \ ImfCompressionAttribute.h \ + ImfDeepImageStateAttribute.h \ ImfDoubleAttribute.h ImfFloatAttribute.h \ ImfFrameBuffer.h ImfHeader.h ImfIO.h \ ImfInputFile.h ImfIntAttribute.h \ diff -up openexr-2.1.0/IlmImf/Makefile.in.headers openexr-2.1.0/IlmImf/Makefile.in --- openexr-2.1.0/IlmImf/Makefile.in.headers 2013-11-12 18:33:11.000000000 -0600 +++ openexr-2.1.0/IlmImf/Makefile.in 2013-11-27 11:33:16.341451113 -0600 @@ -373,6 +373,7 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfCRgbaFile.h ImfChannelList.h \ ImfChannelListAttribute.h \ ImfCompressionAttribute.h \ + ImfDeepImageStateAttribute.h \ ImfDoubleAttribute.h ImfFloatAttribute.h \ ImfFrameBuffer.h ImfHeader.h ImfIO.h \ ImfInputFile.h ImfIntAttribute.h \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.2274 for openSUSE:13.1:Update
by root＠hilbert.suse.de 28 Nov '13

28 Nov '13

Hello community, here is the log from the commit of package patchinfo.2274 for openSUSE:13.1:Update checked in at 2013-11-28 18:11:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.2274 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.2274.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.2274" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <issue id="851596" tracker="bnc">checkmodule doesn't support semicolons in filenames</issue> <category>recommended</category> <rating>moderate</rating> <packager>vitezslav_cizek</packager> <description>- allow semicolon in filenames (bnc#851596) * needed to build selinux-policy * added checkpolicy-allow_semicolon_in_filename.patch - fixes to the minimum policy: - label /var/run/rsyslog correctly * label_var_run_rsyslog.patch - allow systemd-tmpfiles to create devices * systemd-tmpfiles.patch - add rules for sysconfig * correctly label /dev/.sysconfig/network * added sysconfig_network_scripts.patch - run restorecon and fixfiles only if if selinux is enabled - fix console login * allow-local_login_t-read-shadow.patch - allow rsyslog to write to xconsole * xconsole.patch - useradd needs to call selinux_check_access (via pam_rootok) * useradd-netlink_selinux_socket.patch </description> <summary>update for checkpolicy, selinux-policy</summary> </patchinfo>-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0