Hello community, here is the log from the commit of package qmmp-plugin-pack for openSUSE:Factory checked in at 2018-07-22 23:05:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qmmp-plugin-pack (Old) and /work/SRC/openSUSE:Factory/.qmmp-plugin-pack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qmmp-plugin-pack" Sun Jul 22 23:05:39 2018 rev:3 rq:624413 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qmmp-plugin-pack/qmmp-plugin-pack.changes 2018-04-20 17:34:14.348162190 +0200 +++ /work/SRC/openSUSE:Factory/.qmmp-plugin-pack.new/qmmp-plugin-pack.changes 2018-07-22 23:05:41.072898364 +0200 @@ -1,0 +2,8 @@ +Sat Jul 21 08:19:53 UTC 2018 - [email protected] + +- Update to version 1.2.2: + * Fix the Goom plugin: + + fix a segmentation fault; + + fix an issue with gcc optimisations (the -O2 flag). + +------------------------------------------------------------------- Old: ---- qmmp-plugin-pack-1.2.1.tar.bz2 New: ---- qmmp-plugin-pack-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qmmp-plugin-pack.spec ++++++ --- /var/tmp/diff_new_pack.DzQmRP/_old 2018-07-22 23:05:41.592898171 +0200 +++ /var/tmp/diff_new_pack.DzQmRP/_new 2018-07-22 23:05:41.596898169 +0200 @@ -20,7 +20,7 @@ %define qmmp_ver_min 1.2.0 %define qmmp_ver_max 1.2.99 Name: qmmp-plugin-pack -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Extra plugins for Qmmp License: GPL-2.0-or-later ++++++ qmmp-plugin-pack-1.2.1.tar.bz2 -> qmmp-plugin-pack-1.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/CMakeLists.txt new/qmmp-plugin-pack-1.2.2/CMakeLists.txt --- old/qmmp-plugin-pack-1.2.1/CMakeLists.txt 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/CMakeLists.txt 2018-07-19 21:51:47.000000000 +0200 @@ -19,7 +19,7 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -SET(QMMP_PLUGIN_PACK_VERSION 1.2.1) +SET(QMMP_PLUGIN_PACK_VERSION 1.2.2) SET(SVN_VERSION FALSE) INCLUDE(FindPkgConfig) @@ -101,6 +101,8 @@ ARGS ${CMAKE_CURRENT_BINARY_DIR} -name "*_automoc.cpp" | xargs rm -rf COMMAND rm ARGS -rf ${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt + COMMAND find + ARGS ${CMAKE_CURRENT_BINARY_DIR} -name *_automoc.dir | xargs rm -rf TARGET distclean ) ENDIF(UNIX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/ChangeLog new/qmmp-plugin-pack-1.2.2/ChangeLog --- old/qmmp-plugin-pack-1.2.1/ChangeLog 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/ChangeLog 2018-07-19 21:51:47.000000000 +0200 @@ -237,7 +237,7 @@ * updated Galician translation (Delio Docampo Cordeiro) Version 1.1.5 -* added album artist tag support in the ffap plugin +* added album artist tag support in the ffap plugin * fixed cmake 3.10 support * fixed rusxmms support in the mpg123 plugin * updated Greek translation (Dimitrios Glentadakis) @@ -268,3 +268,9 @@ * added ffmpeg 4.0 support in the ffvideo plugin * fixed issues with some corrupted files in the mpg123 plugin * updated Italian translation (Luigi Toscano) + +Version 1.2.2 +* fixed build for windows +* fixed Goom plugin: + - fixed segmentation fault + - fixed issue with gcc optimizations (-O2 flag) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/ChangeLog.rus new/qmmp-plugin-pack-1.2.2/ChangeLog.rus --- old/qmmp-plugin-pack-1.2.1/ChangeLog.rus 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/ChangeLog.rus 2018-07-19 21:51:47.000000000 +0200 @@ -237,7 +237,7 @@ * обновлён галисийский перевод (Delio Docampo Cordeiro) Версия 1.1.5 -* добавлена поддержка тега "исполнитель альбома" в модуле ffap +* добавлена поддержка тега "исполнитель альбома" в модуле ffap * исправлена поддержка cmake 3.10 * исправлена поддержка rusxmms в модуле mpg123 * обновлён греческий перевод (Dimitrios Glentadakis) @@ -268,3 +268,9 @@ * добавлена поддержка ffmpeg 4.0 в модуле ffvideo * исправлены проблемы с некоторыми повреждёнными файлами в модуле mpg123 * обновлён итальянский перевод (Luigi Toscano) + +Версия 1.2.2 +* исправлена сборка для windows +* исправлен модуль Goom: + - исправлена ошибка сегментации + - исправлена проблема с оптимизациями gcc (флаг -O2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/ChangeLog.svn new/qmmp-plugin-pack-1.2.2/ChangeLog.svn --- old/qmmp-plugin-pack-1.2.1/ChangeLog.svn 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/ChangeLog.svn 2018-07-19 21:51:47.000000000 +0200 @@ -1,4 +1,48 @@ ------------------------------------------------------------------------ +r8170 | trialuser02 | 2018-07-18 22:57:52 +0300 (Ср., 18 июля 2018) | 1 line + +fixed changelogs +------------------------------------------------------------------------ +r8166 | trialuser02 | 2018-07-18 22:43:00 +0300 (Ср., 18 июля 2018) | 1 line + +goom: fixed issue with -O2 flag +------------------------------------------------------------------------ +r8165 | trialuser02 | 2018-07-18 22:42:01 +0300 (Ср., 18 июля 2018) | 1 line + +goom: fixed issue with -O2 flag +------------------------------------------------------------------------ +r8162 | trialuser02 | 2018-07-17 21:56:28 +0300 (Вт., 17 июля 2018) | 1 line + +updated changelogs +------------------------------------------------------------------------ +r8158 | trialuser02 | 2018-07-17 21:19:35 +0300 (Вт., 17 июля 2018) | 1 line + +fixed build +------------------------------------------------------------------------ +r8156 | trialuser02 | 2018-07-17 21:18:10 +0300 (Вт., 17 июля 2018) | 1 line + +goom: fixed segmentation fault under x86-64 (#967) +------------------------------------------------------------------------ +r8144 | trialuser02 | 2018-07-14 00:28:04 +0300 (Сб., 14 июля 2018) | 1 line + +updated changelogs +------------------------------------------------------------------------ +r8134 | trialuser02 | 2018-07-08 23:45:56 +0300 (Вс., 08 июля 2018) | 1 line + +fixed include paths +------------------------------------------------------------------------ +r8133 | trialuser02 | 2018-07-08 23:17:40 +0300 (Вс., 08 июля 2018) | 1 line + +fixed win32 support +------------------------------------------------------------------------ +r8002 | trialuser02 | 2018-06-01 10:19:34 +0300 (Пт., 01 июня 2018) | 1 line + +fixed distclean target +------------------------------------------------------------------------ +r7934 | trialuser02 | 2018-04-20 00:54:10 +0300 (Пт., 20 апр. 2018) | 1 line + +version bump +------------------------------------------------------------------------ r7917 | trialuser02 | 2018-04-18 12:19:27 +0300 (Ср., 18 апр. 2018) | 1 line fixed changelogs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/qmmp-plugin-pack.pri new/qmmp-plugin-pack-1.2.2/qmmp-plugin-pack.pri --- old/qmmp-plugin-pack-1.2.1/qmmp-plugin-pack.pri 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/qmmp-plugin-pack.pri 2018-07-19 21:51:47.000000000 +0200 @@ -13,20 +13,17 @@ unix{ INCLUDEPATH += /home/user/qmmp-1.2/include QMAKE_LIBDIR += /home/user/qmmp-1.2/lib -INCLUDEPATH += /usr/include INCLUDEPATH += /usr/local/include }else{ -INCLUDEPATH += D:/projects/qmmp/qmmp-svn/qmmp/src -QMAKE_LIBDIR += D:/projects/qmmp/qmmp-svn/qmmp/bin -INCLUDEPATH += C:/projects/qmmp/qmmp-svn/qmmp/src -QMAKE_LIBDIR += C:/projects/qmmp/qmmp-svn/qmmp/bin +INCLUDEPATH += C:/projects/qmmp-svn-stable/qmmp-1.2/src +QMAKE_LIBDIR += C:/projects/qmmp-svn-stable/qmmp-1.2/bin } QT += widgets #Version -QMMP_PLUGIN_PACK_VERSION = 1.2.1 +QMMP_PLUGIN_PACK_VERSION = 1.2.2 #CONFIG += SVN_VERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/General/history/history.pro new/qmmp-plugin-pack-1.2.2/src/General/history/history.pro --- old/qmmp-plugin-pack-1.2.1/src/General/history/history.pro 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/General/history/history.pro 2018-07-19 21:51:47.000000000 +0200 @@ -25,7 +25,7 @@ RESOURCES = translations/translations.qrc -win32:LIBS += -lqmmpui0 +win32:LIBS += -lqmmpui1 unix { PKGCONFIG += qmmpui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/Input/ffap/dsputil_yasm.asm new/qmmp-plugin-pack-1.2.2/src/Input/ffap/dsputil_yasm.asm --- old/qmmp-plugin-pack-1.2.1/src/Input/ffap/dsputil_yasm.asm 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/Input/ffap/dsputil_yasm.asm 2018-07-19 21:51:47.000000000 +0200 @@ -272,7 +272,7 @@ -; void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top) +; void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diaff, int w, int *left, int *left_top) cglobal add_hfyu_median_prediction_mmx2, 6,6,0, dst, top, diff, w, left, left_top movq mm0, [topq] movq mm2, mm0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/Input/ffap/ffap.pro new/qmmp-plugin-pack-1.2.2/src/Input/ffap/ffap.pro --- old/qmmp-plugin-pack-1.2.1/src/Input/ffap/ffap.pro 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/Input/ffap/ffap.pro 2018-07-19 21:51:47.000000000 +0200 @@ -18,7 +18,7 @@ contains(CONFIG, FFAP_YASM) { - contains(QT_ARCH, i386)|contains(QT_ARCH, x86_64)|contains(QT_ARCH, windows) { + contains(QT_ARCH, i386)|contains(QT_ARCH, x86_64) { ASM_SOURCES += dsputil_yasm.asm x86inc.asm asm_compiler.commands = yasm asm_compiler.commands += ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} @@ -32,15 +32,12 @@ contains(QT_ARCH, i386) { message(Architecture is x86) DEFINES += ARCH_X86_32 - asm_compiler.commands += -f elf -m x86 -DARCH_X86_32 + unix:asm_compiler.commands += -f elf -m x86 -DARCH_X86_32 + win32:asm_compiler.commands += -f win32 -DPREFIX } else:contains(QT_ARCH, x86_64) { message(Architecture is x86_64) DEFINES += ARCH_X86_64 asm_compiler.commands += -f elf64 -m amd64 -DARCH_X86_64 -DPIC - } else:contains(QT_ARCH, windows) { - message(Architecture is x86) - DEFINES += ARCH_X86_32 - asm_compiler.commands += -f win32 -DPREFIX } } else { message(Architecture is unknown) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/Visual/goom/mmx.h new/qmmp-plugin-pack-1.2.2/src/Visual/goom/mmx.h --- old/qmmp-plugin-pack-1.2.1/src/Visual/goom/mmx.h 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/Visual/goom/mmx.h 2018-07-19 21:51:47.000000000 +0200 @@ -72,7 +72,7 @@ void draw_line_xmmx (Pixel *data, int x1, int y1, int x2, int y2, int col, int screenx, int screeny); void zoom_filter_mmx (int prevX, int prevY, Pixel *expix1, Pixel *expix2, int *brutS, int *brutD, int buffratio, int precalCoef[16][16]); -void zoom_filter_xmmx (int prevX, int prevY, Pixel *expix1, Pixel *expix2, +void zoom_filter_xmmx (int prevX, int prevY, Pixel * volatile expix1, Pixel * volatile expix2, int *lbruS, int *lbruD, int buffratio, int precalCoef[16][16]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/Visual/goom/xmmx.c new/qmmp-plugin-pack-1.2.2/src/Visual/goom/xmmx.c --- old/qmmp-plugin-pack-1.2.1/src/Visual/goom/xmmx.c 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/Visual/goom/xmmx.c 2018-07-19 21:51:47.000000000 +0200 @@ -45,18 +45,18 @@ #include "goom_graphic.h" void zoom_filter_xmmx (int prevX, int prevY, - Pixel *expix1, Pixel *expix2, + Pixel * volatile expix1, Pixel * volatile expix2, int *lbruS, int *lbruD, int buffratio, int precalCoef[16][16]) { - int bufsize = prevX * prevY; /* taille du buffer */ + volatile int bufsize = prevX * prevY; /* taille du buffer */ volatile int loop; /* variable de boucle */ - mmx_t *brutS = (mmx_t*)lbruS; /* buffer de transformation source */ - mmx_t *brutD = (mmx_t*)lbruD; /* buffer de transformation dest */ + volatile mmx_t *brutS = (mmx_t*)lbruS; /* buffer de transformation source */ + volatile mmx_t *brutD = (mmx_t*)lbruD; /* buffer de transformation dest */ - mmx_t prevXY; - mmx_t ratiox; + volatile mmx_t prevXY; + volatile mmx_t ratiox; /* volatile mmx_t interpix; */ expix1[0].val=expix1[prevX-1].val=expix1[prevX*prevY-1].val=expix1[prevX*prevY-prevX].val=0; @@ -71,7 +71,7 @@ ("\n\t movq %0, %%mm6" "\n\t pslld $16, %%mm6" /* mm6 = [rat16=buffratio<<16 | rat16=buffratio<<16] */ "\n\t pxor %%mm7, %%mm7" /* mm7 = 0 */ - ::"g"(ratiox)); + ::"m"(ratiox)); loop=0; @@ -145,11 +145,19 @@ "#2 \n\t shll $6,%%esi" "#2 \n\t movd %%mm1,%%eax" +#ifdef ARCH_X86_64 + "#2 \n\t addq %0,%%rsi" + "#2 \n\t andq $15,%%rax" + + "#2 \n\t movq (%%rsi,%%rax,4),%%mm3" + ::"m"(precalCoef):"eax","esi", "rsi", "rax"); +#else "#2 \n\t addl %0,%%esi" "#2 \n\t andl $15,%%eax" "#2 \n\t movd (%%esi,%%eax,4),%%mm3" ::"m"(precalCoef):"eax","esi"); +#endif /* * extraction des coefficients... (Thread #3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qmmp-plugin-pack-1.2.1/src/plugins.pri new/qmmp-plugin-pack-1.2.2/src/plugins.pri --- old/qmmp-plugin-pack-1.2.1/src/plugins.pri 2018-04-19 19:00:57.000000000 +0200 +++ new/qmmp-plugin-pack-1.2.2/src/plugins.pri 2018-07-19 21:51:47.000000000 +0200 @@ -5,7 +5,7 @@ win32 { QMAKE_LIBDIR += ../../../../bin PLUGINS_PREFIX=../../../../bin/plugins - LIBS += -lqmmp0 + LIBS += -lqmmp1 } unix {
