June 2014 - openSUSE Commits - openSUSE Mailing Lists

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2014-06-25 06:57:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2014-06-18 07:47:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2014-06-25 06:57:52.000000000 +0200 @@ -1,0 +2,30 @@ +Mon Jun 23 08:25:46 UTC 2014 - pcerny(a)suse.com + +- Patch #308 - 2014/06/19 + * corrected font used for clipping double-width bitmap fonts + from patch #307 changes to work around mis-scaled fonts + (Debian #752947). + * improve wording of a warning message. + +------------------------------------------------------------------- +Wed Jun 18 09:50:15 UTC 2014 - pcerny(a)suse.com + +- Patch #307 - 2014/06/17 + * fill background for top/bottom parts of + double-width/double-height characters, to cover occasional + gaps due to bitmap font-scaling (report by Egmont Koblinger). + * amend resets for keyboard-type, pointer-mode and title-modes + from xterm #305 changes to account for resource settings + (Debian #751351). + * modify printAttributes feature to include new SGR codes. + * modify cursor show/hide logic to work with italic fonts. + * do clipping and filling for a case with bitmap-fonts and + italics when the font server returns only a "close" match + (report/testcase by Egmont Koblinger). + * adjust loop comparison for underlining to display underlines + on 5x8 font as in patch #304 (Debian #750733). + * amend fix for Freedesktop #15979 (Debian #750733). + * amend xterm.appdata.xml, making it validate with current + schema. + +------------------------------------------------------------------- Old: ---- xterm-306.tgz xterm-306.tgz.asc New: ---- xterm-308.tgz xterm-308.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.oND5H3/_old 2014-06-25 06:57:53.000000000 +0200 +++ /var/tmp/diff_new_pack.oND5H3/_new 2014-06-25 06:57:53.000000000 +0200 @@ -52,7 +52,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 306 +Version: 308 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-306.tgz -> xterm-308.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/MANIFEST new/xterm-308/MANIFEST --- old/xterm-306/MANIFEST 2014-06-03 22:25:02.000000000 +0200 +++ new/xterm-308/MANIFEST 2014-06-19 21:58:13.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-306, version xterm-306 +MANIFEST for xterm-308, version xterm-308 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/cachedGCs.c new/xterm-308/cachedGCs.c --- old/xterm-306/cachedGCs.c 2011-09-11 16:59:38.000000000 +0200 +++ new/xterm-308/cachedGCs.c 2014-06-13 01:04:07.000000000 +0200 @@ -1,7 +1,7 @@ -/* $XTermId: cachedGCs.c,v 1.61 2011/09/11 14:59:38 tom Exp $ */ +/* $XTermId: cachedGCs.c,v 1.62 2014/06/12 23:04:07 tom Exp $ */ /* - * Copyright 2007-2010,2011 by Thomas E. Dickey + * Copyright 2007-2011,2014 by Thomas E. Dickey * * All Rights Reserved * @@ -120,7 +120,7 @@ #undef CASE static const char * -traceVTwin(XtermWidget xw, VTwin * value) +traceVTwin(XtermWidget xw, VTwin *value) { const char *result = "?"; if (value == 0) @@ -273,7 +273,7 @@ * Returns the appropriate cache pointer. */ static CgsCache * -myCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId) +myCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId) { CgsCache *result = 0; @@ -304,7 +304,7 @@ } static Drawable -myDrawable(XtermWidget xw, VTwin * cgsWin) +myDrawable(XtermWidget xw, VTwin *cgsWin) { Drawable drawable = 0; @@ -316,7 +316,7 @@ } static GC -newCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, CgsCache * me) +newCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, CgsCache * me) { XGCValues xgcv; XtGCMask mask; @@ -448,11 +448,12 @@ THIS(used) = 0; return THIS(gc); } + /* * Use the "setCgsXXXX()" calls to initialize parameters for a new GC. */ void -setCgsFore(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel fg) +setCgsFore(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel fg) { CgsCache *me; @@ -463,7 +464,7 @@ } void -setCgsBack(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel bg) +setCgsBack(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel bg) { CgsCache *me; @@ -475,7 +476,7 @@ #if OPT_DEC_CHRSET void -setCgsCSet(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, unsigned cset) +setCgsCSet(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, unsigned cset) { CgsCache *me; @@ -489,7 +490,7 @@ #endif void -setCgsFont(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, XTermFonts * font) +setCgsFont(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, XTermFonts * font) { CgsCache *me; @@ -505,8 +506,9 @@ font = &(TScreenOf(xw)->fnts[fNorm]); } if (HaveFont(font) && okFont(font->fs)) { - TRACE2(("...updated next font in %p for %s to %s\n", - me, traceCgsEnum(cgsId), traceFont(font))); + TRACE2(("setCgsFont next: %s for %s slot %p, gc %#x\n", + traceFont(font), traceCgsEnum(cgsId), + me, (unsigned) THIS(gc))); TRACE2(("...next font was %s\n", traceFont(NEXT(font)))); NEXT(font) = font; me->mask |= GCFont; @@ -523,7 +525,7 @@ * Keep the GC's so we can simply change them rather than creating new ones. */ void -clrCgsFonts(XtermWidget xw, VTwin * cgsWin, XTermFonts * font) +clrCgsFonts(XtermWidget xw, VTwin *cgsWin, XTermFonts * font) { CgsCache *me; int j, k; @@ -559,7 +561,7 @@ * Return a GC associated with the given id, allocating if needed. */ GC -getCgsGC(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId) +getCgsGC(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId) { CgsCache *me; GC result = 0; @@ -648,7 +650,7 @@ * Return the font for the given GC. */ CgsEnum -getCgsId(XtermWidget xw, VTwin * cgsWin, GC gc) +getCgsId(XtermWidget xw, VTwin *cgsWin, GC gc) { int n; CgsEnum result = gcNorm; @@ -670,7 +672,7 @@ * Return the font for the given GC. */ XTermFonts * -getCgsFont(XtermWidget xw, VTwin * cgsWin, GC gc) +getCgsFont(XtermWidget xw, VTwin *cgsWin, GC gc) { int n; XTermFonts *result = 0; @@ -692,7 +694,7 @@ * Return the foreground color for the given GC. */ Pixel -getCgsFore(XtermWidget xw, VTwin * cgsWin, GC gc) +getCgsFore(XtermWidget xw, VTwin *cgsWin, GC gc) { int n; Pixel result = 0; @@ -714,7 +716,7 @@ * Return the background color for the given GC. */ Pixel -getCgsBack(XtermWidget xw, VTwin * cgsWin, GC gc) +getCgsBack(XtermWidget xw, VTwin *cgsWin, GC gc) { int n; Pixel result = 0; @@ -736,7 +738,7 @@ * Copy the parameters (except GC of course) from one cache record to another. */ void -copyCgs(XtermWidget xw, VTwin * cgsWin, CgsEnum dstCgsId, CgsEnum srcCgsId) +copyCgs(XtermWidget xw, VTwin *cgsWin, CgsEnum dstCgsId, CgsEnum srcCgsId) { if (dstCgsId != srcCgsId) { CgsCache *me; @@ -801,7 +803,7 @@ * Swap the cache records, e.g., when doing reverse-video. */ void -swapCgs(XtermWidget xw, VTwin * cgsWin, CgsEnum dstCgsId, CgsEnum srcCgsId) +swapCgs(XtermWidget xw, VTwin *cgsWin, CgsEnum dstCgsId, CgsEnum srcCgsId) { if (dstCgsId != srcCgsId) { CgsCache *dst; @@ -826,7 +828,7 @@ * Free any GC associated with the given id. */ GC -freeCgs(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId) +freeCgs(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId) { CgsCache *me; int j; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/charproc.c new/xterm-308/charproc.c --- old/xterm-306/charproc.c 2014-06-04 01:38:02.000000000 +0200 +++ new/xterm-308/charproc.c 2014-06-13 02:53:14.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1359 2014/06/03 23:38:02 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1363 2014/06/13 00:53:14 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -7734,7 +7734,10 @@ init_Ires(screen.border); init_Bres(screen.jumpscroll); init_Bres(screen.fastscroll); + init_Bres(screen.old_fkeys); + wnew->screen.old_fkeys0 = wnew->screen.old_fkeys; + init_Bres(screen.delete_is_del); initializeKeyboardType(wnew); #ifdef ALLOWLOGGING @@ -7784,6 +7787,8 @@ TScreenOf(wnew)->vtXX_level = (TScreenOf(wnew)->terminal_id / 100); init_Ires(screen.title_modes); + wnew->screen.title_modes0 = wnew->screen.title_modes; + init_Bres(screen.visualbell); init_Bres(screen.flash_line); init_Ires(screen.visualBellDelay); @@ -7837,6 +7842,7 @@ TScreenOf(wnew)->pointer_cursor = TScreenOf(request)->pointer_cursor; init_Ires(screen.pointer_mode); + wnew->screen.pointer_mode0 = wnew->screen.pointer_mode; init_Sres(screen.answer_back); @@ -8545,7 +8551,9 @@ XFreeCursor(screen->display, screen->hidden_cursor); xtermCloseFonts(xw, screen->fnts); +#if OPT_WIDE_ATTRS xtermCloseFonts(xw, screen->ifnts); +#endif noleaks_cachedCgs(xw); TRACE_FREE_LEAK(screen->selection_targets_8bit); @@ -8615,6 +8623,7 @@ TRACE_FREE_LEAK(xw->misc.default_font.f_wb); #endif +#if OPT_LOAD_VTFONTS || OPT_WIDE_CHARS for (n = 0; n < NMENUFONTS; ++n) { for (k = 0; k < fMAX; ++k) { if (screen->menu_font_names[n][k] != @@ -8626,6 +8635,7 @@ } } } +#endif #if OPT_SELECT_REGEX for (n = 0; n < NSELECTUNITS; ++n) { @@ -9929,6 +9939,28 @@ XDrawLines(screen->display, VWindow(screen), outlineGC, screen->box, NBOX, CoordModePrevious); } else { +#if OPT_WIDE_ATTRS + int italics_on = ((ld->attribs[cursor_col] & ATR_ITALIC) != 0); + int italics_off = ((xw->flags & ATR_ITALIC) != 0); + int fix_italics = (italics_on != italics_off); + int which_font = (xw->flags & BOLD ? fBold : fNorm); + + if_OPT_WIDE_CHARS(screen, { + if (isWide((int) base)) { + which_font = (xw->flags & BOLD ? fWBold : fWide); + } + }); + + if (fix_italics) { + xtermLoadItalics(xw); + if (italics_on) { + setCgsFont(xw, currentWin, currentCgs, &screen->ifnts[which_font]); + } else { + setCgsFont(xw, currentWin, currentCgs, &screen->fnts[which_font]); + } + } + currentGC = getCgsGC(xw, currentWin, currentCgs); +#endif /* OPT_WIDE_ATTRS */ drawXtermText(xw, flags & DRAWX_MASK, @@ -9959,6 +9991,15 @@ XDrawLines(screen->display, VDrawable(screen), outlineGC, screen->box, NBOX, CoordModePrevious); } +#if OPT_WIDE_ATTRS + if (fix_italics) { + if (italics_on) { + setCgsFont(xw, currentWin, currentCgs, &screen->fnts[which_font]); + } else { + setCgsFont(xw, currentWin, currentCgs, &screen->ifnts[which_font]); + } + } +#endif } } screen->cursor_state = ON; @@ -9986,6 +10027,10 @@ #endif int cursor_col; LineData *ld = 0; +#if OPT_WIDE_ATTRS + unsigned attr_flags; + int which_font = fNorm; +#endif if (screen->cursor_state == OFF) return; @@ -10060,6 +10105,24 @@ else in_selection = True; +#if OPT_WIDE_ATTRS + attr_flags = ld->attribs[cursor_col]; + if ((attr_flags & ATR_ITALIC) ^ (xw->flags & ATR_ITALIC)) { + which_font = (attr_flags & BOLD ? fBold : fNorm); + + if_OPT_WIDE_CHARS(screen, { + if (isWide((int) base)) { + which_font = (attr_flags & BOLD ? fWBold : fWide); + } + }); + setCgsFont(xw, WhichVWin(screen), + whichXtermCgs(xw, attr_flags, in_selection), + ((attr_flags & ATR_ITALIC) + ? &screen->ifnts[which_font] + : &screen->fnts[which_font])); + } +#endif + currentGC = updatedXtermGC(xw, flags, fg_bg, in_selection); TRACE(("HideCursor calling drawXtermText cur(%d,%d)\n", @@ -10091,6 +10154,16 @@ }); #endif screen->cursor_state = OFF; + +#if OPT_WIDE_ATTRS + if ((attr_flags & ATR_ITALIC) ^ (xw->flags & ATR_ITALIC)) { + setCgsFont(xw, WhichVWin(screen), + whichXtermCgs(xw, xw->flags, in_selection), + ((xw->flags & ATR_ITALIC) + ? &screen->ifnts[which_font] + : &screen->fnts[which_font])); + } +#endif resetXtermGC(xw, flags, in_selection); refresh_displayed_graphics(screen, @@ -10335,7 +10408,10 @@ TabReset(xw->tabs); xw->keyboard.flags = MODE_SRM; + + screen->old_fkeys = screen->old_fkeys0; initializeKeyboardType(xw); + #if OPT_INITIAL_ERASE if (xw->keyboard.reset_DECBKM == 1) xw->keyboard.flags |= MODE_DECBKM; @@ -10349,8 +10425,8 @@ #if OPT_SCROLL_LOCK xtermClearLEDs(screen); #endif - screen->title_modes = DEF_TITLE_MODES; - screen->pointer_mode = DEF_POINTER_MODE; + screen->title_modes = screen->title_modes0; + screen->pointer_mode = screen->pointer_mode0; #if OPT_SIXEL_GRAPHICS if (TScreenOf(xw)->sixel_scrolling) xw->keyboard.flags |= MODE_DECSDM; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/fontutils.c new/xterm-308/fontutils.c --- old/xterm-306/fontutils.c 2014-05-30 10:29:56.000000000 +0200 +++ new/xterm-308/fontutils.c 2014-06-17 22:38:27.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.427 2014/05/30 08:29:56 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.439 2014/06/17 20:38:27 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -107,20 +107,20 @@ */ typedef struct { /* registry, foundry, family */ - char *beginning; + const char *beginning; /* weight */ - char *weight; + const char *weight; /* slant */ - char *slant; + const char *slant; /* wideness */ - char *wideness; + const char *wideness; /* add style */ - char *add_style; + const char *add_style; int pixel_size; - char *point_size; + const char *point_size; int res_x; int res_y; - char *spacing; + const char *spacing; int average_width; /* charset registry, charset encoding */ char *end; @@ -215,7 +215,7 @@ /* * Returns the fields from start to stop in a dash- separated string. This - * function will modify the source, putting '\0's in the appropiate place and + * function will modify the source, putting '\0's in the appropriate place and * moving the beginning forward to after the '\0' * * This will NOT work for the last field (but we won't need it). @@ -469,7 +469,7 @@ italic_font_name(FontNameProperties *props, int use_average_width) { FontNameProperties myprops = *props; - myprops.slant = (char *) "o"; + myprops.slant = "o"; return derive_font_name(&myprops, props->weight, use_average_width, props->end); } #endif @@ -630,6 +630,36 @@ } /* + * Check normal/bold (or wide/wide-bold) font pairs to see if we will be able + * to check for missing glyphs in a comparable manner. + */ +static int +comparable_metrics(XFontStruct *normal, XFontStruct *bold) +{ +#define DATA "comparable_metrics: " + int result = 0; + + if (normal->all_chars_exist) { + if (bold->all_chars_exist) { + result = 1; + } else { + TRACE((DATA "all chars exist in normal font, but not in bold\n")); + } + } else if (normal->per_char != 0) { + if (bold->per_char != 0) { + result = 1; + } else { + TRACE((DATA "normal font has per-char metrics, but not bold\n")); + } + } else { + TRACE((DATA "normal font is not very good!\n")); + result = 1; /* give in (we're not going in reverse) */ + } + return result; +#undef DATA +} + +/* * If the font server tries to adjust another font, it may not adjust it * properly. Check that the bounding boxes are compatible. Otherwise we'll * leave trash on the display when we mix normal and bold fonts. @@ -764,10 +794,10 @@ cache_menu_font_name(TScreen *screen, int fontnum, int which, const char *name) { if (name != 0) { - char *last = (char *) screen->menu_font_names[fontnum][which]; + String last = screen->menu_font_names[fontnum][which]; if (last != 0) { if (strcmp(last, name)) { - free(last); + FREE_STRING(last); TRACE(("caching menu fontname %d.%d %s\n", fontnum, which, name)); screen->menu_font_names[fontnum][which] = x_strdup(name); } @@ -913,7 +943,6 @@ { if (!IsEmpty(fnt->fn)) { XFontStruct *fs = fnt->fs; - unsigned missing = 0; unsigned first_char = 0; unsigned last_char = 0; unsigned ch; @@ -926,12 +955,6 @@ last_char = (fs->max_byte1 * 256) + fs->max_char_or_byte2; } - for (ch = first_char; ch <= last_char; ++ch) { - if (xtermMissingChar(ch, fnt)) { - ++missing; - } - } - printf("\t%s: %s\n", tag, NonNull(fnt->fn)); printf("\t\tall chars: %s\n", fs->all_chars_exist ? "yes" : "no"); printf("\t\tdefault char: %d\n", fs->default_char); @@ -941,8 +964,19 @@ printf("\t\tfirst char: %u\n", first_char); printf("\t\tlast char: %u\n", last_char); printf("\t\tmaximum-chars: %u\n", countGlyphs(fs)); - printf("\t\tmissing-chars: %u\n", missing); - printf("\t\tpresent-chars: %u\n", countGlyphs(fs) - missing); + if (FontLacksMetrics(fnt)) { + printf("\t\tmissing-chars: ?\n"); + printf("\t\tpresent-chars: ?\n"); + } else { + unsigned missing = 0; + for (ch = first_char; ch <= last_char; ++ch) { + if (xtermMissingChar(ch, fnt)) { + ++missing; + } + } + printf("\t\tmissing-chars: %u\n", missing); + printf("\t\tpresent-chars: %u\n", countGlyphs(fs) - missing); + } printf("\t\tmin_byte1: %d\n", fs->min_byte1); printf("\t\tmax_byte1: %d\n", fs->max_byte1); printf("\t\tproperties: %d\n", fs->n_properties); @@ -1015,6 +1049,24 @@ }); } +#if OPT_TRACE +static void +show_font_misses(const char *name, XTermFonts * fp) +{ + if (fp->fs != 0) { + if (FontLacksMetrics(fp)) { + TRACE(("%s font lacks metrics\n", name)); + } else if (FontIsIncomplete(fp)) { + TRACE(("%s font is incomplete\n", name)); + } else { + TRACE(("%s font is complete\n", name)); + } + } else { + TRACE(("%s font is missing\n", name)); + } +} +#endif + int xtermLoadFont(XtermWidget xw, const VTFontNames * fonts, @@ -1114,7 +1166,8 @@ if (fp == 0 || fnts[fBold].fs == 0) { xtermCopyFontInfo(&fnts[fBold], &fnts[fNorm]); TRACE(("...cannot load a matching bold font\n")); - } else if (same_font_size(xw, fnts[fNorm].fs, fnts[fBold].fs) + } else if (comparable_metrics(fnts[fNorm].fs, fnts[fBold].fs) + && same_font_size(xw, fnts[fNorm].fs, fnts[fBold].fs) && got_bold_font(screen->display, fnts[fBold].fs, myfonts.f_b)) { TRACE(("...got a matching bold font\n")); cache_menu_font_name(screen, fontnum, fBold, myfonts.f_b); @@ -1241,8 +1294,10 @@ if_OPT_WIDE_CHARS(screen, { if (fnts[fWide].fs != 0 && fnts[fWBold].fs != 0 - && !same_font_size(xw, fnts[fWide].fs, fnts[fWBold].fs) - && (is_fixed_font(fnts[fWide].fs) && is_fixed_font(fnts[fWBold].fs))) { + && (!comparable_metrics(fnts[fWide].fs, fnts[fWBold].fs) + || (!same_font_size(xw, fnts[fWide].fs, fnts[fWBold].fs) + && is_fixed_font(fnts[fWide].fs) + && is_fixed_font(fnts[fWBold].fs)))) { TRACE(("...ignoring mismatched normal/bold wide fonts\n")); xtermCloseFont(xw, &fnts[fWBold]); xtermCopyFontInfo(&fnts[fWBold], &fnts[fWide]); @@ -1329,10 +1384,15 @@ { unsigned ch; - TRACE(("normal font is %scomplete\n", - FontIsIncomplete(&fnts[fNorm]) ? "in" : "")); - TRACE(("bold font is %scomplete\n", - FontIsIncomplete(&fnts[fBold]) ? "in" : "")); +#if OPT_TRACE +#define TRACE_MISS(index) show_font_misses(#index, &fnts[index]) + TRACE_MISS(fNorm); + TRACE_MISS(fBold); +#if OPT_WIDE_CHARS + TRACE_MISS(fWide); + TRACE_MISS(fWBold); +#endif +#endif for (ch = 1; ch < 32; ch++) { unsigned n = ch; @@ -1474,11 +1534,26 @@ screen->fnts[n].fs, 0)) != 0) { if ((name = italic_font_name(fp, fp->average_width)) != 0) { + TRACE(("xtermLoadItalics #%d %s\n", n, name)); (void) xtermOpenFont(xw, name, &(screen->ifnts[n]), fwResource, False); +#if OPT_TRACE + { + XFontStruct *fs = + screen->ifnts[n].fs; + if (fs != 0) { + TRACE(("...actual size %dx%d (ascent %d, descent %d)\n", + fs->ascent + + fs->descent, + fs->max_bounds.width, + fs->ascent, + fs->descent)); + } + } +#endif free(name); } } @@ -1527,7 +1602,18 @@ } #define COPY_DEFAULT_FONTS(target, source) \ - target.default_font = source.default_font + xtermCopyVTFontNames(&target.default_font, &source.default_font) + +static void +xtermCopyVTFontNames(VTFontNames * target, VTFontNames * source) +{ + target->f_n = x_strdup(source->f_n); + target->f_b = x_strdup(source->f_b); +#if OPT_WIDE_CHARS + target->f_w = x_strdup(source->f_w); + target->f_wb = x_strdup(source->f_wb); +#endif +} void xtermSaveVTFonts(XtermWidget xw) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/fontutils.h new/xterm-308/fontutils.h --- old/xterm-306/fontutils.h 2014-05-26 18:48:15.000000000 +0200 +++ new/xterm-308/fontutils.h 2014-06-08 23:10:27.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.h,v 1.93 2014/05/26 16:48:15 tom Exp $ */ +/* $XTermId: fontutils.h,v 1.94 2014/06/08 21:10:27 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -64,8 +64,8 @@ #define FontIsIncomplete(font) \ ((font)->fs != 0 \ - && ((font)->fs->per_char == 0 \ - || !(font)->fs->all_chars_exist)) + && (font)->fs->per_char != 0 \ + && !(font)->fs->all_chars_exist) #if OPT_BOX_CHARS @@ -90,8 +90,7 @@ #define IsXtermMissingChar(screen, ch, font) \ (CheckedKnownMissing(font, ch) \ ? ((font)->known_missing[(Char)(ch)] > 1) \ - : (FontLacksMetrics(font) \ - || (FontIsIncomplete(font) && xtermMissingChar(ch, font)) \ + : ((FontIsIncomplete(font) && xtermMissingChar(ch, font)) \ || ForceBoxChars(screen, ch))) extern void xtermDrawBoxChar (XtermWidget /* xw */, unsigned /* ch */, unsigned /* attr_flags */, unsigned /* draw_flags */, GC /* gc */, int /* x */, int /* y */, int /* cols */); @@ -99,7 +98,7 @@ #define IsXtermMissingChar(screen, ch, font) False #endif -#if OPT_BOX_CHARS || OPT_REPORT_FONTS +#if OPT_BOX_CHARS || OPT_REPORT_FONTS extern Bool xtermMissingChar (unsigned /* ch */, XTermFonts */* font */); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/package/debian/changelog new/xterm-308/package/debian/changelog --- old/xterm-306/package/debian/changelog 2014-06-04 02:17:14.000000000 +0200 +++ new/xterm-308/package/debian/changelog 2014-06-19 21:58:13.000000000 +0200 @@ -1,3 +1,15 @@ +xterm-dev (308) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Thu, 19 Jun 2014 15:58:13 -0400 + +xterm-dev (307) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Wed, 04 Jun 2014 18:58:36 -0400 + xterm-dev (306) unstable; urgency=low * fix incomplete implementation of new SGRs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/package/freebsd/Makefile new/xterm-308/package/freebsd/Makefile --- old/xterm-306/package/freebsd/Makefile 2014-06-03 22:25:05.000000000 +0200 +++ new/xterm-308/package/freebsd/Makefile 2014-06-19 21:58:13.000000000 +0200 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 306 +PORTVERSION= 308 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/package/xterm.spec new/xterm-308/package/xterm.spec --- old/xterm-306/package/xterm.spec 2014-06-03 22:25:02.000000000 +0200 +++ new/xterm-308/package/xterm.spec 2014-06-19 21:58:13.000000000 +0200 @@ -1,11 +1,11 @@ -# $XTermId: xterm.spec,v 1.70 2014/06/03 20:25:02 tom Exp $ +# $XTermId: xterm.spec,v 1.72 2014/06/19 19:58:13 tom Exp $ Summary: X terminal emulator (development version) %global my_middle xterm %global my_suffix -dev %global fullname %{my_middle}%{my_suffix} %global my_class XTermDev Name: %{fullname} -Version: 306 +Version: 308 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/print.c new/xterm-308/print.c --- old/xterm-306/print.c 2014-05-11 12:55:11.000000000 +0200 +++ new/xterm-308/print.c 2014-06-13 02:36:51.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: print.c,v 1.151 2014/05/11 10:55:11 tom Exp $ */ +/* $XTermId: print.c,v 1.152 2014/06/13 00:36:51 tom Exp $ */ /* * Copyright 1997-2013,2014 by Thomas E. Dickey @@ -379,6 +379,12 @@ strcpy(msg, "\033[0"); if (attr & BOLD) strcat(msg, ";1"); +#if OPT_WIDE_ATTRS + if (attr & ATR_FAINT) + strcat(msg, ";2"); + if (attr & ATR_ITALIC) + strcat(msg, ";3"); +#endif if (attr & UNDERLINE) strcat(msg, ";4"); /* typo? DEC documents this as '2' */ if (attr & BLINK) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/ptyx.h new/xterm-308/ptyx.h --- old/xterm-306/ptyx.h 2014-05-26 17:32:29.000000000 +0200 +++ new/xterm-308/ptyx.h 2014-06-13 02:53:35.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.808 2014/05/26 15:32:29 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.809 2014/06/13 00:53:35 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -2027,6 +2027,7 @@ #endif /* NO_ACTIVE_ICON */ int pointer_mode; /* when to use hidden_cursor */ + int pointer_mode0; /* ...initial value */ Boolean hide_pointer; /* true to use "hidden_cursor" */ Cursor pointer_cursor; /* pointer cursor in window */ Cursor hidden_cursor; /* hidden cursor in window */ @@ -2173,6 +2174,7 @@ IFlags save_modes[DP_LAST]; /* save dec/xterm private modes */ int title_modes; /* control set/get of titles */ + int title_modes0; /* ...initial value */ SaveTitle *save_title; /* Improved VT100 emulation stuff. */ @@ -2193,6 +2195,7 @@ Boolean jumpscroll; /* whether we should jumpscroll */ Boolean fastscroll; /* whether we should fastscroll */ Boolean old_fkeys; /* true for compatible fkeys */ + Boolean old_fkeys0; /* ...initial value */ Boolean underline; /* whether to underline text */ #if OPT_MAXIMIZE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/screen.c new/xterm-308/screen.c --- old/xterm-306/screen.c 2014-05-26 19:54:45.000000000 +0200 +++ new/xterm-308/screen.c 2014-06-19 23:09:11.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: screen.c,v 1.496 2014/05/26 17:54:45 tom Exp $ */ +/* $XTermId: screen.c,v 1.500 2014/06/19 21:09:11 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -62,7 +62,7 @@ #include <X11/Xatom.h> -#if OPT_WIDE_CHARS +#if OPT_WIDE_ATTRS || OPT_WIDE_CHARS #include <fontutils.h> #endif @@ -1423,7 +1423,7 @@ #endif static int recurse = 0; #if OPT_WIDE_ATTRS - unsigned old_attrs = 0; + unsigned old_attrs = xw->flags; #endif TRACE(("ScrnRefresh top %d (%d,%d) - (%d,%d)%s {{\n", @@ -1431,6 +1431,8 @@ nrows, ncols, force ? " force" : "")); + ++recurse; + if (screen->cursorp.col >= leftcol && screen->cursorp.col <= (leftcol + ncols - 1) && screen->cursorp.row >= ROW2INX(screen, toprow) @@ -1510,7 +1512,7 @@ col = leftcol; } } else { - xtermWarning("This should not happen. Why is it so?\n"); + xtermWarning("Unexpected recursion drawing hidden characters.\n"); } }); @@ -1549,13 +1551,11 @@ } else { /* row intersects selection; split into pieces of single type */ if (row == screen->startH.row && col < screen->startH.col) { - recurse++; ScrnRefresh(xw, row, col, 1, screen->startH.col - col, force); col = screen->startH.col; } if (row == screen->endH.row && maxcol >= screen->endH.col) { - recurse++; ScrnRefresh(xw, row, screen->endH.col, 1, maxcol - screen->endH.col + 1, force); maxcol = screen->endH.col - 1; @@ -1766,6 +1766,9 @@ * screen foreground and background so that other functions (e.g., * ClearRight) will get the correct colors. */ +#if OPT_WIDE_ATTRS + (void) refreshFontGCs(xw, xw->flags, old_attrs); +#endif if_OPT_ISO_COLORS(screen, { if (gc_changes & FG_COLOR) SGR_Foreground(xw, xw->cur_foreground); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/util.c new/xterm-308/util.c --- old/xterm-306/util.c 2014-06-04 01:39:08.000000000 +0200 +++ new/xterm-308/util.c 2014-06-20 00:15:20.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: util.c,v 1.648 2014/06/03 23:39:08 tom Exp $ */ +/* $XTermId: util.c,v 1.660 2014/06/19 22:15:20 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -3222,13 +3222,14 @@ if (screen->underline && !did_ul) { int repeat = 0; int descent = FontDescent(screen); + int length = x + (int) underline_len * font_width - 1; #if OPT_WIDE_ATTRS if ((attr_flags & ATR_STRIKEOUT)) { int where = y - ((3 * FontAscent(screen)) / 8); XDrawLine(screen->display, VDrawable(screen), gc, x, where, - x + (int) underline_len * font_width - 1, + length, where); } if ((attr_flags & ATR_DBL_UNDER)) { @@ -3239,17 +3240,65 @@ repeat = 1; } while (repeat-- > 0) { - if (descent-- > 0) + if (descent-- > 1) y++; XDrawLine(screen->display, VDrawable(screen), gc, x, y, - x + (int) underline_len * font_width - 1, + length, y); } } return y; } +#if OPT_WIDE_ATTRS +/* + * As a special case, we are currently allowing italic fonts to be inexact + * matches for the normal font's size. That introduces a problem: either the + * ascent or descent may be shorter, leaving a gap that has to be filled in. + * Or they may be larger, requiring clipping. Check for both cases. + */ +static int +fixupItalics(XtermWidget xw, + unsigned draw_flags, + GC gc, + XTermFonts * curFont, + int y, int x, + int font_width, + Cardinal len) +{ + TScreen *screen = TScreenOf(xw); + VTwin *cgsWin = WhichVWin(screen); + XFontStruct *realFp = curFont->fs; + XFontStruct *thisFp = getCgsFont(xw, cgsWin, gc)->fs; + int need_clipping = 0; + int need_filling = 0; + + if (thisFp->ascent > realFp->ascent) + need_clipping = 1; + else if (thisFp->ascent < realFp->ascent) + need_filling = 1; + + if (thisFp->descent > realFp->descent) + need_clipping = 1; + else if (thisFp->descent < realFp->descent) + need_filling = 1; + + if (need_clipping) { + beginClipping(screen, gc, font_width, (int) len); + } + if (need_filling) { + xtermFillCells(xw, + draw_flags, + gc, + x, + y - realFp->ascent, + len); + } + return need_clipping; +} +#endif + /* * Draws text with the specified combination of bold/underline. The return * value is the updated x position. @@ -3275,6 +3324,10 @@ int font_width = ((draw_flags & DOUBLEWFONT) ? 2 : 1) * screen->fnt_wide; Bool did_ul = False; XTermFonts *curFont; +#if OPT_WIDE_ATTRS || OPT_WIDE_CHARS + int need_clipping = 0; + int ascent_adjust = 0; +#endif #if OPT_WIDE_CHARS if (text == 0) @@ -3337,6 +3390,7 @@ if (nr) { xtermSetClipRectangles(screen->display, gc2, x, y, rp, nr, YXBanded); + xtermFillCells(xw, draw_flags, gc, x, y + rect.y, len * 2); } else { XSetClipMask(screen->display, gc2, None); } @@ -3609,14 +3663,14 @@ } #endif /* OPT_BOX_CHARS */ - y = drawUnderline(xw, - gc, - attr_flags, - underline_len, - FontWidth(screen), - x, - y, - did_ul); + (void) drawUnderline(xw, + gc, + attr_flags, + underline_len, + FontWidth(screen), + x, + y, + did_ul); x += (int) len *FontWidth(screen); @@ -3835,7 +3889,6 @@ if (screen->wide_chars || screen->unicode_font) { XChar2b *buffer; Bool needWide = False; - int ascent_adjust = 0; int src, dst; Bool useBoldFont; @@ -3969,6 +4022,14 @@ setCgsBack(xw, currentWin, cgsId, bg); gc = getCgsGC(xw, currentWin, cgsId); +#if OPT_WIDE_ATTRS +#if OPT_DEC_CHRSET + if (!(CSET_DOUBLE(chrset) || (draw_flags & DOUBLEWFONT))) +#endif + need_clipping = fixupItalics(xw, draw_flags, gc, + getCgsFont(xw, currentWin, gc), + y, x, font_width, len); +#endif if (fntId != fNorm) { XFontStruct *thisFp = WhichVFont(screen, fnts[fntId].fs); ascent_adjust = (thisFp->ascent @@ -3999,6 +4060,11 @@ x, y + ascent_adjust, buffer, dst); } +#if OPT_WIDE_ATTRS + if (need_clipping) { + endClipping(screen, gc); + } +#endif if ((attr_flags & BOLDATTR(screen)) && (screen->enbolden || !useBoldFont)) { beginClipping(screen, gc, (Cardinal) font_width, len); @@ -4026,6 +4092,14 @@ char *buffer = (char *) text; #endif +#if OPT_WIDE_ATTRS +#if OPT_DEC_CHRSET + if (!(CSET_DOUBLE(chrset) || (draw_flags & DOUBLEWFONT))) +#endif + need_clipping = fixupItalics(xw, draw_flags, gc, curFont, + y, x, font_width, len); +#endif + if (draw_flags & NOBACKGROUND) { XDrawString(screen->display, VDrawable(screen), gc, x, y, buffer, length); @@ -4033,6 +4107,12 @@ XDrawImageString(screen->display, VDrawable(screen), gc, x, y, buffer, length); } + +#if OPT_WIDE_ATTRS + if (need_clipping) { + endClipping(screen, gc); + } +#endif underline_len = (Cardinal) length; if ((attr_flags & BOLDATTR(screen)) && screen->enbolden) { beginClipping(screen, gc, font_width, length); @@ -4042,14 +4122,14 @@ } } - y = drawUnderline(xw, - gc, - attr_flags, - underline_len, - font_width, - x, - y, - did_ul); + (void) drawUnderline(xw, + gc, + attr_flags, + underline_len, + font_width, + x, + y, + did_ul); x += ((int) real_length) * FontWidth(screen); return x; @@ -4116,6 +4196,28 @@ TRACE_HINTS(&(xw->hints)); } +CgsEnum +whichXtermCgs(XtermWidget xw, unsigned attr_flags, Bool hilite) +{ + TScreen *screen = TScreenOf(xw); + CgsEnum cgsId = gcMAX; + + if (ReverseOrHilite(screen, attr_flags, hilite)) { + if (attr_flags & BOLDATTR(screen)) { + cgsId = gcBoldReverse; + } else { + cgsId = gcNormReverse; + } + } else { + if (attr_flags & BOLDATTR(screen)) { + cgsId = gcBold; + } else { + cgsId = gcNorm; + } + } + return cgsId; +} + /* * Returns a GC, selected according to the font (reverse/bold/normal) that is * required for the current position (implied). The GC is updated with the @@ -4126,7 +4228,7 @@ { TScreen *screen = TScreenOf(xw); VTwin *win = WhichVWin(screen); - CgsEnum cgsId = gcMAX; + CgsEnum cgsId = whichXtermCgs(xw, attr_flags, hilite); unsigned my_fg = extract_fg(xw, fg_bg, attr_flags); unsigned my_bg = extract_bg(xw, fg_bg, attr_flags); Pixel fg_pix = getXtermForeground(xw, attr_flags, (int) my_fg); @@ -4152,12 +4254,6 @@ checkVeryBoldColors(attr_flags, my_fg); if (ReverseOrHilite(screen, attr_flags, hilite)) { - if (attr_flags & BOLDATTR(screen)) { - cgsId = gcBoldReverse; - } else { - cgsId = gcNormReverse; - } - #if OPT_HIGHLIGHT_COLOR if (!screen->hilite_color) { if (selbg_pix != T_COLOR(screen, TEXT_FG) @@ -4186,12 +4282,6 @@ } } #endif - } else { - if (attr_flags & BOLDATTR(screen)) { - cgsId = gcBold; - } else { - cgsId = gcNorm; - } } #if OPT_HIGHLIGHT_COLOR if (!screen->hilite_color || !screen->hilite_reverse) { @@ -4227,29 +4317,16 @@ { TScreen *screen = TScreenOf(xw); VTwin *win = WhichVWin(screen); - CgsEnum cgsId = gcMAX; + CgsEnum cgsId = whichXtermCgs(xw, attr_flags, hilite); Pixel fg_pix = getXtermForeground(xw, attr_flags, xw->cur_foreground); Pixel bg_pix = getXtermBackground(xw, attr_flags, xw->cur_background); checkVeryBoldColors(attr_flags, xw->cur_foreground); if (ReverseOrHilite(screen, attr_flags, hilite)) { - if (attr_flags & BOLDATTR(screen)) { - cgsId = gcBoldReverse; - } else { - cgsId = gcNormReverse; - } - setCgsFore(xw, win, cgsId, bg_pix); setCgsBack(xw, win, cgsId, fg_pix); - } else { - if (attr_flags & BOLDATTR(screen)) { - cgsId = gcBold; - } else { - cgsId = gcNorm; - } - setCgsFore(xw, win, cgsId, fg_pix); setCgsBack(xw, win, cgsId, bg_pix); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/version.h new/xterm-308/version.h --- old/xterm-306/version.h 2014-06-03 22:25:02.000000000 +0200 +++ new/xterm-308/version.h 2014-06-19 21:58:13.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.388 2014/06/03 20:25:02 tom Exp $ */ +/* $XTermId: version.h,v 1.391 2014/06/19 19:58:13 tom Exp $ */ /* * Copyright 1998-2013,2014 by Thomas E. Dickey @@ -38,8 +38,8 @@ * version of X to which this version of xterm has been built. The resulting * number in parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 306 -#define XTERM_DATE 2014-06-03 +#define XTERM_PATCH 308 +#define XTERM_DATE 2014-06-19 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/xterm.appdata.xml new/xterm-308/xterm.appdata.xml --- old/xterm-306/xterm.appdata.xml 2014-06-03 00:54:29.000000000 +0200 +++ new/xterm-308/xterm.appdata.xml 2014-06-08 19:29:25.000000000 +0200 @@ -2,7 +2,8 @@  <application> <id type="desktop">xterm.desktop</id> - <licence>X11</licence> + <metadata_license>CC-BY-3.0</metadata_license> + <project_license>X11</project_license> <name>XTerm</name> <summary>Terminal emulator for the X Window System</summary> <description> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/xterm.h new/xterm-308/xterm.h --- old/xterm-306/xterm.h 2014-05-26 16:37:18.000000000 +0200 +++ new/xterm-308/xterm.h 2014-06-13 01:41:47.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: xterm.h,v 1.741 2014/05/26 14:37:18 tom Exp $ */ +/* $XTermId: xterm.h,v 1.742 2014/06/12 23:41:47 tom Exp $ */ /* * Copyright 1999-2013,2014 by Thomas E. Dickey @@ -1329,6 +1329,7 @@ /* util.c */ extern Boolean isDefaultBackground(const char * /* name */); extern Boolean isDefaultForeground(const char * /* name */); +extern CgsEnum whichXtermCgs(XtermWidget /* xw */, unsigned /* attr_flags */, Bool /* hilite */); extern GC updatedXtermGC (XtermWidget /* xw */, unsigned /* flags */, unsigned /* fg_bg */, Bool /* hilite */); extern Pixel getXtermBackground(XtermWidget /* xw */, unsigned /* flags */, int /* color */); extern Pixel getXtermForeground(XtermWidget /* xw */, unsigned /* flags */, int /* color */); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-306/xterm.log.html new/xterm-308/xterm.log.html --- old/xterm-306/xterm.log.html 2014-06-04 02:28:35.000000000 +0200 +++ new/xterm-308/xterm.log.html 2014-06-20 02:05:20.000000000 +0200 @@ -30,7 +30,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1481 2014/06/04 00:28:35 tom Exp $ + $XTermId: xterm.log.html,v 1.1493 2014/06/20 00:05:20 tom Exp $ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"> @@ -72,6 +72,10 @@ CHANGELOG</a>).</p> <ul> + <li><a href="#xterm_308">Patch #308 - 2014/06/19</a></li> + + <li><a href="#xterm_307">Patch #307 - 2014/06/17</a></li> + <li><a href="#xterm_306">Patch #306 - 2014/06/03</a></li> <li><a href="#xterm_305">Patch #305 - 2014/06/02</a></li> @@ -897,6 +901,49 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_308" id="xterm_308">Patch #308 - + 2014/06/19</a></h1> + + <ul> + <li>corrected font used for clipping double-width bitmap fonts + from <a href="#xterm_307">patch #307</a> changes to work around + mis-scaled fonts (Debian #752947).</li> + + <li>improve wording of a warning message.</li> + </ul> + + <h1><a name="xterm_307" id="xterm_307">Patch #307 - + 2014/06/17</a></h1> + + <ul> + <li>fill background for top/bottom parts of + double-width/double-height characters, to cover occasional gaps + due to bitmap font-scaling (report by Egmont Koblinger).</li> + + <li>amend resets for keyboard-type, pointer-mode and + title-modes from <a href="#xterm_305">xterm #305</a> changes to + account for resource settings (Debian #751351).</li> + + <li>modify <em>printAttributes</em> feature to include new SGR + codes.</li> + + <li>modify cursor show/hide logic to work with italic + fonts.</li> + + <li>do clipping and filling for a case with bitmap-fonts and + italics when the font server returns only a "close" match + (report/testcase by Egmont Koblinger).</li> + + <li>adjust loop comparison for underlining to display + underlines on 5x8 font as in <a href="#xterm_304">patch + #304</a> (Debian #750733).</li> + + <li>amend fix for Freedesktop #15979 (Debian #750733).</li> + + <li>amend xterm.appdata.xml, making it validate with current + schema.</li> + </ul> + <h1><a name="xterm_306" id="xterm_306">Patch #306 - 2014/06/03</a></h1> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pacemaker for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package pacemaker for openSUSE:Factory checked in at 2014-06-25 06:57:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pacemaker (Old) and /work/SRC/openSUSE:Factory/.pacemaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pacemaker" Changes: -------- --- /work/SRC/openSUSE:Factory/pacemaker/pacemaker.changes 2014-05-26 10:27:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker.changes 2014-06-25 06:57:51.000000000 +0200 @@ -1,0 +2,66 @@ +Fri Jun 13 03:16:29 UTC 2014 - ygao(a)suse.com + +- Bug cl#5219 - PE: Allow unrelated resources with a common colocation target to remain promoted +- Bug cl#5222 - Enable legacy mode whenever a broadcast update is detected (bnc#881575) +- xml: Prevent incorrect xml diffs from corrupting the cib (bnc#878362) +- mainloop: implement gio_poll_dispatch_mod +- cluster: Prevent search of unames from attempting to create node entries for unknown nodes (bnc#881884) +- Upstream version cs: 97629ded958f76652350569a54303b3cd25d1d7e + +------------------------------------------------------------------- +Wed Jun 11 05:44:21 UTC 2014 - ygao(a)suse.com + +- crm_report: Gracefully handle rediculously large logfiles +- Bug cl#5222 - cib: Repair rolling update capability (bnc#881575) +- cib: Use a better option name for enabling the legacy cib diff code (cl#5222, bnc#881575) +- remote: clear remote-node status correctly +- pengine: properly handle fencing of container remote-nodes when the container is orphaned +- remote: Handle request/response ipc proxy correctly +- cib: Prevent assert on sending cib sync requests (cl#5222, bnc#881575) +- crm_simulate: Clean up temporary shadow files on exit (bnc#879934) +- pengine: cl#5200 - Before migrating utilization-using resources to a node, take off the load that will no longer run there if it's not introducing transition loop + (Rework cl#5044, lf#2599, bnc#695440) +- Fencing: Cache metadata lookups to avoid repeated blocking during device registration +- pengine: properly place resource within a container when container is a remote-node. +- mainloop: Better handle the killing of processes in the act of exiting +- services: Remove cancelled recurring ops from internal lists as early as possible +- services: Remove file descriptors from mainloop as soon as we have drained them +- pengine: Don't report a resource as restarting when it is a moving multistate resource +- pengine: avoid assert by searching for stop action on correct node during LogActions +- Upstream version cs: 734e6b538b0a037f9e7d0709f450bd664f26c332 + +------------------------------------------------------------------- +Mon Jun 2 03:17:54 UTC 2014 - ygao(a)suse.com + +- cib: Drop the message serverity now that the cause is well understood +- crmd: Avoid spamming the cib by triggering a transition only once per non-status change +- Upstream version cs: 559f733e8818a96085134cd2a34efc280c512a2a + +------------------------------------------------------------------- +Thu May 29 10:38:11 UTC 2014 - ygao(a)suse.com + +- pengine: Prevent possible segfault (bnc#880258) +- attrd: Ensure attribute dampening is always observed +- Bug cl#5213 - Limit the scope of the previous commit to the masters role +- membership: Avoid duplicate peer entries in the peer cache +- Bug cl#5184 - Ensure pending probes that ultimately fail are correctly updated (bnc#804763, bnc#879034) +- Upstream version cs: 9776707a6232f25812009145fafa8a64c5b53910 + +------------------------------------------------------------------- +Tue May 27 09:39:48 UTC 2014 - ygao(a)suse.com + +- Rebase: + * pacemaker-colocated-utilization.patch + +- Bug cl#5213 - Ensure role colocation with -INFINITY is enforced +- pengine: Mark unrunnable stop actions as "blocked" and show the correct current locations (bnc#878662) +- pengine: Block restart of resources if any dependent resource in a group is unmanaged (bnc#878662) +- systemd: Try to handle dbus actions that complete prior to configuring a callback +- mainloop: Canceling in-flight operations should not fail if child process has already exited. +- Bug rhbz#1097457 - Limit the scope of the previous fix and include a helpful comment +- Bug cl#5212 - Do not promote instances when quorum is lots and no-quorum-policy=freeze +- Bug rhbz#1097457 - Prevent invalid transition when resource are ordered to start after the container they're started in +- Fix: fix small memory leaks +- Upstream version cs: 25ebca2b83df9263aedb944ea4eeb53468e90e83 + +------------------------------------------------------------------- @@ -94 +160 @@ -- pengine: Correctly search failcount +- pengine: Correctly search failcount (bnc#880520) Old: ---- pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 New: ---- pacemaker-1.1.11+git20140613.97629de.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.wDcXGZ/_old 2014-06-25 06:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.wDcXGZ/_new 2014-06-25 06:57:52.000000000 +0200 @@ -99,7 +99,7 @@ Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.11+git20140512.da5aaab +Version: 1.1.11+git20140613.97629de Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wDcXGZ/_old 2014-06-25 06:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.wDcXGZ/_new 2014-06-25 06:57:52.000000000 +0200 @@ -11,7 +11,7 @@ <param name="version">1.1.11</param> --> <param name="versionformat">1.1.11+git%cd.%h</param> - <param name="revision">da5aaab97ca5b7858f2aac98107a1a7ffc3e4252</param> + <param name="revision">97629ded958f76652350569a54303b3cd25d1d7e</param> </service> <service name="recompress" mode="disabled"> ++++++ pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 -> pacemaker-1.1.11+git20140613.97629de.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pacemaker/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 /work/SRC/openSUSE:Factory/.pacemaker.new/pacemaker-1.1.11+git20140613.97629de.tar.bz2 differ: char 11, line 1 ++++++ pacemaker-colocated-utilization.patch ++++++ --- /var/tmp/diff_new_pack.wDcXGZ/_old 2014-06-25 06:57:52.000000000 +0200 +++ /var/tmp/diff_new_pack.wDcXGZ/_new 2014-06-25 06:57:52.000000000 +0200 @@ -317,9 +317,9 @@ CRM_ASSERT(rsc_rh); - filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint); + filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE); - - switch (filter_results) { - case influence_rsc_priority: + pe_rsc_trace(rsc_lh, "%sColocating %s with %s (%s, weight=%d, filter=%d)", + constraint->score >= 0 ? "" : "Anti-", + rsc_lh->id, rsc_rh->id, constraint->id, constraint->score, filter_results); @@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml free(name); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-tools for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2014-06-25 06:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old) and /work/SRC/openSUSE:Factory/.alsa-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2014-03-16 08:05:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2014-06-25 06:57:47.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Jun 18 13:18:03 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-tools 1.0.28: + All pervious fix patches are obsoleted: + 0001-Add-a-distclean-target-to-example-Makefile.patch + 0002-Fix-spelling-of-successfully.patch + 0003-Fix-bashisms.patch + 0004-Fix-build-errors-caused-by-Werror-format-security.patch + 0005-Add-AM_MAINTAINER_MODE-enable-macro-to-all-configure.patch + 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch + 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch + +------------------------------------------------------------------- Old: ---- 0001-Add-a-distclean-target-to-example-Makefile.patch 0002-Fix-spelling-of-successfully.patch 0003-Fix-bashisms.patch 0004-Fix-build-errors-caused-by-Werror-format-security.patch 0005-Add-AM_MAINTAINER_MODE-enable-macro-to-all-configure.patch 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch alsa-tools-1.0.27.tar.bz2 New: ---- alsa-tools-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.2Gj4Tf/_old 2014-06-25 06:57:48.000000000 +0200 +++ /var/tmp/diff_new_pack.2Gj4Tf/_new 2014-06-25 06:57:48.000000000 +0200 @@ -16,7 +16,7 @@ # -%define package_version 1.0.27 +%define package_version 1.0.28 # %if 0%{?suse_version} > 1140 %define have_gtk3 1 @@ -24,7 +24,7 @@ %define have_gtk3 0 %endif Name: alsa-tools -Version: 1.0.27 +Version: 1.0.28 Release: 0 Summary: Various ALSA Tools License: GPL-2.0+ @@ -38,13 +38,6 @@ Source7: rme.png Source8: envy24.png # upstream fixes -Patch1: 0001-Add-a-distclean-target-to-example-Makefile.patch -Patch2: 0002-Fix-spelling-of-successfully.patch -Patch3: 0003-Fix-bashisms.patch -Patch4: 0004-Fix-build-errors-caused-by-Werror-format-security.patch -Patch5: 0005-Add-AM_MAINTAINER_MODE-enable-macro-to-all-configure.patch -Patch6: 0006-hdajackretask-Fix-killing-PulseAudio-on-newer-PulseA.patch -Patch7: 0007-hdspmixer-Add-support-for-RME-AIO-AEB-boards.patch # build fixes Patch100: alsa-tools-desktop-fix.dif Patch101: alsa-tools-no_m4_dir.dif @@ -89,13 +82,6 @@ %setup -q -a 2 -n %{name}-%{package_version} cp %{SOURCE1} . # upstream fixes -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # build fixes %patch100 -p1 %patch101 -p1 ++++++ alsa-tools-1.0.27.tar.bz2 -> alsa-tools-1.0.28.tar.bz2 ++++++ ++++ 17856 lines of diff (skipped) ++++++ alsa-tools-no_m4_dir.dif ++++++ --- /var/tmp/diff_new_pack.2Gj4Tf/_old 2014-06-25 06:57:49.000000000 +0200 +++ /var/tmp/diff_new_pack.2Gj4Tf/_new 2014-06-25 06:57:49.000000000 +0200 @@ -1,22 +1,22 @@ --- - ld10k1/configure.in | 1 - - qlo10k1/configure.in | 1 - + ld10k1/configure.ac | 1 - + qlo10k1/configure.ac | 1 - 2 files changed, 2 deletions(-) ---- a/ld10k1/configure.in -+++ b/ld10k1/configure.in +--- a/ld10k1/configure.ac ++++ b/ld10k1/configure.ac @@ -1,6 +1,5 @@ - AC_INIT(src/ld10k1.c) - AM_INIT_AUTOMAKE(ld10k1, 0.1.8p1) + AC_INIT(ld10k1, 0.1.8p1) + AM_INIT_AUTOMAKE -AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_HEADERS(config.h) ---- a/qlo10k1/configure.in -+++ b/qlo10k1/configure.in +--- a/qlo10k1/configure.ac ++++ b/qlo10k1/configure.ac @@ -1,7 +1,6 @@ - AC_INIT(src/main.cpp) - AM_INIT_AUTOMAKE(qlo10k1, 0.1.2p1) + AC_INIT(qlo10k1, 0.1.2p1) + AM_INIT_AUTOMAKE AM_MAINTAINER_MODE([enable]) -AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.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 xerces-j2 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package xerces-j2 for openSUSE:Factory checked in at 2014-06-25 06:57:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xerces-j2 (Old) and /work/SRC/openSUSE:Factory/.xerces-j2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xerces-j2" Changes: -------- --- /work/SRC/openSUSE:Factory/xerces-j2/xerces-j2.changes 2013-09-11 17:11:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xerces-j2.new/xerces-j2.changes 2014-06-25 06:57:50.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 11 13:06:12 UTC 2014 - tchvatal(a)suse.com + +- Drop unused patches: + * xerces-build.patch + * xerces-j2-gcj-switch-constants-bug.patch + +------------------------------------------------------------------- Old: ---- xerces-build.patch xerces-j2-gcj-switch-constants-bug.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xerces-j2.spec ++++++ --- /var/tmp/diff_new_pack.6INZLf/_old 2014-06-25 06:57:50.000000000 +0200 +++ /var/tmp/diff_new_pack.6INZLf/_new 2014-06-25 06:57:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-firmware for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa-firmware for openSUSE:Factory checked in at 2014-06-25 06:57:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-firmware (Old) and /work/SRC/openSUSE:Factory/.alsa-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-firmware" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-firmware/alsa-firmware.changes 2014-02-11 10:22:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-firmware.new/alsa-firmware.changes 2014-06-25 06:57:44.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 18 13:19:24 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-firmware 1.0.28: + Removed obsoleted patch + 0001-Add-cs46xx-entry-to-the-main-configure-and-Makefile..patch: + +------------------------------------------------------------------- Old: ---- 0001-Add-cs46xx-entry-to-the-main-configure-and-Makefile..patch alsa-firmware-1.0.27.tar.bz2 cs46xx.tar.bz2 New: ---- alsa-firmware-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-firmware.spec ++++++ --- /var/tmp/diff_new_pack.a2TpCR/_old 2014-06-25 06:57:45.000000000 +0200 +++ /var/tmp/diff_new_pack.a2TpCR/_new 2014-06-25 06:57:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: alsa-firmware -%define package_version 1.0.27 +%define package_version 1.0.28 Url: http://www.alsa-project.org/ Summary: Firmware Data Files for ALSA License: GPL-2.0+ @@ -27,13 +27,11 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(udev) %endif -Version: 1.0.27 +Version: 1.0.28 Release: 0 Source: ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{package_version}.ta… Source1: usx2yaudio.rules Source2: usx2yaudio-old.rules -Source3: cs46xx.tar.bz2 -Patch1: 0001-Add-cs46xx-entry-to-the-main-configure-and-Makefile..patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: alsa @@ -47,8 +45,7 @@ Various firmware data files for ALSA drivers. %prep -%setup -q -n %{name}-%{package_version} -a 3 -%patch1 -p1 +%setup -q -n %{name}-%{package_version} %build autoreconf -fi ++++++ alsa-firmware-1.0.27.tar.bz2 -> alsa-firmware-1.0.28.tar.bz2 ++++++ ++++ 8721 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 alsa-oss for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa-oss for openSUSE:Factory checked in at 2014-06-25 06:57:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-oss (Old) and /work/SRC/openSUSE:Factory/.alsa-oss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-oss" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-oss/alsa-oss.changes 2014-04-29 17:33:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-oss.new/alsa-oss.changes 2014-06-25 06:57:42.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jun 18 13:23:04 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-oss 1.0.28: + All pervious fix patches are obsoleted: + 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch + 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch + 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch + +------------------------------------------------------------------- Old: ---- 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch alsa-oss-1.0.25.tar.bz2 New: ---- alsa-oss-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-oss.spec ++++++ --- /var/tmp/diff_new_pack.DTvGDS/_old 2014-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.DTvGDS/_new 2014-06-25 06:57:43.000000000 +0200 @@ -19,19 +19,16 @@ Name: alsa-oss BuildRequires: alsa-devel BuildRequires: libtool -%define package_version 1.0.25 +%define package_version 1.0.28 Summary: ALSA-OSS Wrapper License: GPL-2.0+ Group: System/Libraries -Version: 1.0.25 +Version: 1.0.28 Release: 0 Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{package_version}.tar.bz2 Source2: baselibs.conf # Patch: alsa-oss-hg-fixes.diff # upstream fixes -Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch -Patch3: 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch -Patch4: 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch Url: http://www.alsa-project.org/ %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -45,9 +42,6 @@ %prep %setup -q -n %{name}-%{package_version} # %patch -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build autoreconf -fi ++++++ alsa-oss-1.0.25.tar.bz2 -> alsa-oss-1.0.28.tar.bz2 ++++++ ++++ 59204 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-oss-1.0.25/alsa/pcm.c new/alsa-oss-1.0.28/alsa/pcm.c --- old/alsa-oss-1.0.25/alsa/pcm.c 2012-01-25 08:57:09.000000000 +0100 +++ new/alsa-oss-1.0.28/alsa/pcm.c 2014-06-12 11:33:37.000000000 +0200 @@ -263,10 +263,11 @@ if (err < 0) return err; periods_min = 2; - err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); - if (err < 0) - return err; - if (dsp->maxfrags > 0) { + if (!dsp->maxfrags) { + err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); + if (err < 0) + return err; + } else { unsigned int periods_max = periods_min > dsp->maxfrags ? periods_min : dsp->maxfrags; err = snd_pcm_hw_params_set_periods_max(pcm, hw, @@ -308,8 +309,8 @@ if (err < 0) return err; #if 0 - if (alsa_oss_debug) - snd_pcm_dump_setup(pcm, stderr); + if (alsa_oss_debug && alsa_oss_debug_out) + snd_pcm_dump_setup(pcm, alsa_oss_debug_out); #endif if (err < 0) return err; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-oss-1.0.25/configure.ac new/alsa-oss-1.0.28/configure.ac --- old/alsa-oss-1.0.25/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-oss-1.0.28/configure.ac 2014-06-12 11:33:37.000000000 +0200 @@ -0,0 +1,40 @@ +AC_PREREQ(2.59) +AC_INIT(alsa-oss, 1.0.28) +AM_INIT_AUTOMAKE + +AM_MAINTAINER_MODE([enable]) + +LIBTOOL_VERSION_INFO="0:0:0" +AC_SUBST(LIBTOOL_VERSION_INFO) + +AC_PREFIX_DEFAULT(/usr) + +AC_PROG_CC +AC_PROG_CXX +AC_PROG_INSTALL +AC_PROG_LN_S +AM_PROG_LIBTOOL + +dnl Check for aoss... +AC_MSG_CHECKING(for aoss) +AC_ARG_WITH(aoss, + [ --with-aoss=yes,no OSS -> ALSA emulation library build], + with_aoss="$withval", with_aoss="yes") +if test "$with_aoss" = "yes"; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes) + +if test "$with_aoss" = "yes"; then + OLD_CFLAGS="$CFLAGS" + OLD_LIBS="$LIBS" + AM_PATH_ALSA(0.9.0) + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" +fi + +AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \ + oss-redir/Makefile test/Makefile \ + alsa/testaoss test/testaoss) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-oss-1.0.25/configure.in new/alsa-oss-1.0.28/configure.in --- old/alsa-oss-1.0.25/configure.in 2012-01-25 08:57:09.000000000 +0100 +++ new/alsa-oss-1.0.28/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -AC_PREREQ(2.59) -AC_INIT(alsa/alsa-oss.c) -AM_INIT_AUTOMAKE(alsa-oss, 1.0.25) - -LIBTOOL_VERSION_INFO="0:0:0" -AC_SUBST(LIBTOOL_VERSION_INFO) - -AC_PREFIX_DEFAULT(/usr) - -AC_PROG_CC -AC_PROG_CXX -AC_PROG_INSTALL -AC_PROG_LN_S -AM_PROG_LIBTOOL - -dnl Check for aoss... -AC_MSG_CHECKING(for aoss) -AC_ARG_WITH(aoss, - [ --with-aoss=yes,no OSS -> ALSA emulation library build], - with_aoss="$withval", with_aoss="yes") -if test "$with_aoss" = "yes"; then - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes) - -if test "$with_aoss" = "yes"; then - OLD_CFLAGS="$CFLAGS" - OLD_LIBS="$LIBS" - AM_PATH_ALSA(0.9.0) - CFLAGS="$OLD_CFLAGS" - LIBS="$OLD_LIBS" -fi - -AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \ - oss-redir/Makefile test/Makefile \ - alsa/testaoss test/testaoss) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-oss-1.0.25/missing new/alsa-oss-1.0.28/missing --- old/alsa-oss-1.0.25/missing 2012-01-25 10:33:06.000000000 +0100 +++ new/alsa-oss-1.0.28/missing 2014-06-13 11:25:16.000000000 +0200 @@ -1,10 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.18; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -26,7 +25,7 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi @@ -34,7 +33,7 @@ sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' sed_minuso='s/.* -o $[^ ]*$.*/\1/p' -# In the cases where this matters, `missing' is being run in the +# In the cases where this matters, 'missing' is being run in the # srcdir already. if test -f configure.ac; then configure_ac=configure.ac @@ -65,7 +64,7 @@ echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an error status if there is no known handling for PROGRAM. Options: @@ -74,21 +73,20 @@ --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' + aclocal touch file 'aclocal.m4' + autoconf touch file 'configure' + autoheader touch file 'config.h.in' autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c + automake touch all 'Makefile.in' files + bison create 'y.tab.[ch]', if possible, from existing .[ch] + flex create 'lex.yy.c', if possible, from existing .c help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c + lex create 'lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + yacc create 'y.tab.[ch]', if possible, from existing .[ch] -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -100,8 +98,8 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; @@ -122,22 +120,13 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. exit 1 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether + # running '$TOOL --version' or '$TOOL --help' to check whether # $TOOL exists and not knowing $TOOL uses missing. exit 1 fi @@ -149,27 +138,27 @@ case $program in aclocal*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from +WARNING: '$1' is $msg. You should only need it if + you modified 'acinclude.m4' or '${configure_ac}'. You might want + to install the Automake and Perl packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU +WARNING: '$1' is $msg. You should only need it if + you modified '${configure_ac}'. You might want to install the + Autoconf and GNU m4 packages. Grab them from any GNU archive site." touch configure ;; autoheader*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them +WARNING: '$1' is $msg. You should only need it if + you modified 'acconfig.h' or '${configure_ac}'. You might want + to install the Autoconf and GNU m4 packages. Grab them from any GNU archive site." files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" @@ -186,9 +175,9 @@ automake*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. +WARNING: '$1' is $msg. You should only need it if + you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. + You might want to install the Automake and Perl packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | @@ -197,10 +186,10 @@ autom4te*) echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. +WARNING: '$1' is needed, but is $msg. You might have modified some files without having the proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU + You can get '$1' as part of Autoconf from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` @@ -220,13 +209,13 @@ bison*|yacc*) echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package +WARNING: '$1' $msg. You should only need it if + you modified a '.y' file. You may need the Bison package in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." + Bison from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -250,13 +239,13 @@ lex*|flex*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package +WARNING: '$1' is $msg. You should only need it if + you modified a '.l' file. You may need the Flex package in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." + Flex from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -273,10 +262,10 @@ help2man*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if +WARNING: '$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." + Help2man package in order for those modifications to take + effect. You can get Help2man from any GNU archive site." file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -291,12 +280,12 @@ makeinfo*) echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file +WARNING: '$1' is $msg. You should only need it if + you modified a '.texi' or '.texinfo' file, or any other file indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." + call might also be the consequence of using a buggy 'make' (AIX, + DU, IRIX). You might want to install the Texinfo package or + the GNU make package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... file=`echo "$*" | sed -n "$sed_output"` test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` @@ -318,49 +307,14 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. +WARNING: '$1' is needed, and is $msg. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, + proper tools for further handling them. Check the 'README' file, it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." + some other package would contain this missing '$1' program." exit 1 ;; esac -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-plugins for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at 2014-06-25 06:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-plugins (Old) and /work/SRC/openSUSE:Factory/.alsa-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-plugins" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-plugins/alsa-plugins.changes 2014-03-16 08:05:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-plugins.new/alsa-plugins.changes 2014-06-25 06:57:41.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jun 18 13:14:30 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-plugins 1.0.28: + All pervious fix patches are obsoleted: + 0001-Check-for-and-include-libavutil.h-to-avoid-unresolve.patch + 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch + 0003-vdownmix-Add-chmap-support.patch + 0004-upmix-Add-chmap-support.patch + 0005-a52-Fix-build-error-with-the-recent-version.patch + 0006-a52-Add-chmap-support.patch + 0007-a52-Propagate-errors-from-hw.patch + 0008-a52-switch-to-AV_CODEC_ID-identifiers.patch + 0009-jack-Allow-to-specify-a-client-name-as-parameters.patch + +------------------------------------------------------------------- Old: ---- 0001-Check-for-and-include-libavutil.h-to-avoid-unresolve.patch 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch 0003-vdownmix-Add-chmap-support.patch 0004-upmix-Add-chmap-support.patch 0005-a52-Fix-build-error-with-the-recent-version.patch 0006-a52-Add-chmap-support.patch 0007-a52-Propagate-errors-from-hw.patch 0008-a52-switch-to-AV_CODEC_ID-identifiers.patch 0009-jack-Allow-to-specify-a-client-name-as-parameters.patch alsa-plugins-1.0.27.tar.bz2 New: ---- alsa-plugins-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Zh0D3G/_old 2014-06-25 06:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Zh0D3G/_new 2014-06-25 06:57:42.000000000 +0200 @@ -16,7 +16,7 @@ # -%define package_version 1.0.27 +%define package_version 1.0.28 %if 0%{?suse_version} > 1030 %define build_pulse 1 %define build_speex 1 @@ -25,7 +25,7 @@ %define build_speex 0 %endif Name: alsa-plugins -Version: 1.0.27 +Version: 1.0.28 Release: 0 Summary: Extra Plug-Ins for the ALSA Library License: LGPL-2.1+ @@ -36,15 +36,6 @@ Source2: alsa-pulse.conf Source3: baselibs.conf # upstream fixes -Patch1: 0001-Check-for-and-include-libavutil.h-to-avoid-unresolve.patch -Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch -Patch3: 0003-vdownmix-Add-chmap-support.patch -Patch4: 0004-upmix-Add-chmap-support.patch -Patch5: 0005-a52-Fix-build-error-with-the-recent-version.patch -Patch6: 0006-a52-Add-chmap-support.patch -Patch7: 0007-a52-Propagate-errors-from-hw.patch -Patch8: 0008-a52-switch-to-AV_CODEC_ID-identifiers.patch -Patch9: 0009-jack-Allow-to-specify-a-client-name-as-parameters.patch BuildRequires: alsa-devel BuildRequires: dbus-1-devel BuildRequires: libjack-devel @@ -137,15 +128,6 @@ %prep %setup -q -n %{name}-%{package_version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build export AUTOMAKE_JOBS="%{?_smp_mflags}" ++++++ alsa-plugins-1.0.27.tar.bz2 -> alsa-plugins-1.0.28.tar.bz2 ++++++ ++++ 1776 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/a52/pcm_a52.c new/alsa-plugins-1.0.28/a52/pcm_a52.c --- old/alsa-plugins-1.0.27/a52/pcm_a52.c 2013-04-11 13:43:08.000000000 +0200 +++ new/alsa-plugins-1.0.28/a52/pcm_a52.c 2014-06-12 11:32:45.000000000 +0200 @@ -26,12 +26,7 @@ #include <alsa/pcm_external.h> #include <alsa/pcm_plugin.h> #include AVCODEC_HEADER - -#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34 -#include <libavutil/audioconvert.h> -#include <libavutil/mem.h> -#define USE_AVCODEC_FRAME -#endif +#include <libavutil/avutil.h> /* some compatibility wrappers */ #ifndef AV_VERSION_INT @@ -43,6 +38,12 @@ LIBAVCODEC_VERSION_MICRO) #endif +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0) +#include <libavutil/audioconvert.h> +#include <libavutil/mem.h> +#define USE_AVCODEC_FRAME +#endif + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 0) #ifndef AV_CH_LAYOUT_STEREO #define AV_CH_LAYOUT_STEREO CH_LAYOUT_STEREO @@ -57,6 +58,9 @@ #endif #endif +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0) +#define AV_CODEC_ID_AC3 CODEC_ID_AC3 +#endif struct a52_ctx { snd_pcm_ioplug_t io; @@ -194,8 +198,8 @@ err = write_out_pending(io, rec); if (err < 0) return err; - snd_pcm_drain(rec->slave); - return 0; + + return snd_pcm_drain(rec->slave); } /* check whether the areas consist of a continuous interleaved stream */ @@ -478,16 +482,14 @@ { struct a52_ctx *rec = io->private_data; - snd_pcm_start(rec->slave); - return 0; + return snd_pcm_start(rec->slave); } static int a52_stop(snd_pcm_ioplug_t *io) { struct a52_ctx *rec = io->private_data; - snd_pcm_drop(rec->slave); - return 0; + return snd_pcm_drop(rec->slave); } /* release resources */ @@ -644,10 +646,60 @@ a52_free(rec); if (rec->slave) - snd_pcm_close(rec->slave); + return snd_pcm_close(rec->slave); return 0; } +#if SND_PCM_IOPLUG_VERSION >= 0x102 +static unsigned int chmap4[4] = { + SND_CHMAP_FL, SND_CHMAP_FR, + SND_CHMAP_RL, SND_CHMAP_RR, +}; +static unsigned int chmap6[6] = { + SND_CHMAP_FL, SND_CHMAP_FR, + SND_CHMAP_FC, SND_CHMAP_LFE, + SND_CHMAP_RL, SND_CHMAP_RR, +}; + +static snd_pcm_chmap_query_t **a52_query_chmaps(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED) +{ + snd_pcm_chmap_query_t **maps; + int i; + + maps = calloc(4, sizeof(void *)); + if (!maps) + return NULL; + for (i = 0; i < 3; i++) { + snd_pcm_chmap_query_t *p; + p = maps[i] = calloc((i + 1) * 2 + 2, sizeof(int)); + if (!p) { + snd_pcm_free_chmaps(maps); + return NULL; + } + p->type = SND_CHMAP_TYPE_FIXED; + p->map.channels = (i + 1) * 2; + memcpy(p->map.pos, i < 2 ? chmap4 : chmap6, + (i + 1) * 2 * sizeof(int)); + } + return maps; +} + +static snd_pcm_chmap_t *a52_get_chmap(snd_pcm_ioplug_t *io) +{ + snd_pcm_chmap_t *map; + + if ((io->channels % 2) || io->channels < 2 || io->channels > 6) + return NULL; + map = malloc((io->channels + 1) * sizeof(int)); + if (!map) + return NULL; + map->channels = io->channels; + memcpy(map->pos, io->channels < 6 ? chmap4 : chmap6, + io->channels * sizeof(int)); + return map; +} +#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */ + /* * callback table */ @@ -665,6 +717,10 @@ .poll_descriptors_count = a52_poll_descriptors_count, .poll_descriptors = a52_poll_descriptors, .poll_revents = a52_poll_revents, +#if SND_PCM_IOPLUG_VERSION >= 0x102 + .query_chmaps = a52_query_chmaps, + .get_chmap = a52_get_chmap, +#endif /* SND_PCM_IOPLUG_VERSION >= 0x102 */ }; /* @@ -863,7 +919,7 @@ if (rec->codec == NULL) rec->codec = avcodec_find_encoder_by_name("ac3"); if (rec->codec == NULL) - rec->codec = avcodec_find_encoder(CODEC_ID_AC3); + rec->codec = avcodec_find_encoder(AV_CODEC_ID_AC3); if (rec->codec == NULL) { SNDERR("Cannot find codec engine"); err = -EINVAL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/config.h.in new/alsa-plugins-1.0.28/config.h.in --- old/alsa-plugins-1.0.27/config.h.in 2013-04-11 14:54:24.000000000 +0200 +++ new/alsa-plugins-1.0.28/config.h.in 2014-06-13 11:23:45.000000000 +0200 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* directory containing ALSA data files */ #undef ALSA_DATA_DIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/configure.ac new/alsa-plugins-1.0.28/configure.ac --- old/alsa-plugins-1.0.27/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-plugins-1.0.28/configure.ac 2014-06-12 11:32:45.000000000 +0200 @@ -0,0 +1,226 @@ +AC_PREREQ(2.59) +AC_INIT(alsa-plugins, 1.0.28) +AM_INIT_AUTOMAKE +AC_PREFIX_DEFAULT(/usr) + +AM_MAINTAINER_MODE([enable]) + +AC_CONFIG_HEADERS(config.h) +AC_CONFIG_MACRO_DIR([m4]) + +AC_PROG_CC +AC_PROG_INSTALL +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +AC_HEADER_STDC + +CC_NOUNDEFINED + +PKG_CHECK_MODULES(ALSA, alsa >= 1.0.11) +AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, + AC_ERROR([*** libasound has no external plugin SDK]), -ldl) + +AC_ARG_ENABLE([jack], + AS_HELP_STRING([--disable-jack], [Disable building of JACK plugin])) + +if test "x$enable_jack" != "xno"; then + PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) +fi +AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes) + +AC_ARG_ENABLE([pulseaudio], + AS_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) + +if test "x$enable_pulseaudio" != "xno"; then + PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.11], [HAVE_PULSE=yes], [HAVE_PULSE=no]) +fi +AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes) + +AC_ARG_ENABLE([samplerate], + AS_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin])) + +if test "x$enable_samplerate" != "xno"; then + PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) +fi +AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes) + +AC_ARG_ENABLE([maemo-plugin], + AS_HELP_STRING([--enable-maemo-plugin], + [Build Maemo DSP plugin]), + [HAVE_MAEMO_PLUGIN="$enableval"], [HAVE_MAEMO_PLUGIN="no"]) +AM_CONDITIONAL(HAVE_MAEMO_PLUGIN, test x$HAVE_MAEMO_PLUGIN = xyes) + +AC_ARG_ENABLE([maemo-resource-manager], + AS_HELP_STRING([--enable-maemo-resource-manager], + [Use Maemo resource manager]), + [use_maemo_rm="$enableval"], [use_maemo_rm="no"]) + +if test "$use_maemo_rm" = "yes"; then + PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=yes], [HAVE_DBUS=no]) + + if test "$HAVE_DBUS" = "yes"; then + AC_DEFINE(USE_RESOURCE_MANAGER, 1,"Use dbus server as a resouce manager") + else + AC_ERROR([You must have D-Bus installed if you want to enable the Maemo resource manager]) + fi +fi + +AC_ARG_ENABLE([avcodec], + AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)])) + +if test "x$enable_avcodec" != "xno"; then + PKG_CHECK_MODULES(AVCODEC, [libavcodec libavutil], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) +fi + +if test "x$HAVE_AVCODEC" = "xno"; then + AC_ARG_WITH([avcodec-includedir], + AS_HELP_STRING([--with-avcodec-includedir=dir], + [AVcodec include directory]), + [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""]) + AC_ARG_WITH([avcodec-libdir], + AS_HELP_STRING([--with-avcodec-libdir=dir], + [AVcodec library directory]), + [AVCODEC_LIBS="-L$withval"], [AVCODEC_LIBS=""]) + + CFLAGS_saved="$CFLAGS" + LDFLAGS_saved="$LDFLAGS" + CFLAGS="$CFLAGS $AVCODEC_CFLAGS" + LDFLAGS="$LDFLAGS $AVCODEC_LIBS" + AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec" + AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) + CFLAGS="$CFLAGS_saved" + LDFLAGS="$LDFLAGS_saved" +fi + +if test $HAVE_AVCODEC = yes; then + AVCODEC_HEADER="" + AC_CHECK_HEADER([ffmpeg/avcodec.h], [AVCODEC_HEADER='<ffmpeg/avcodec.h>']) + if test -z "$AVCODEC_HEADER"; then + AC_CHECK_HEADER([libavcodec/avcodec.h], [AVCODEC_HEADER='<libavcodec/avcodec.h>']) + fi + if test -z "$AVCODEC_HEADER"; then + HAVE_AVCODEC=no + fi +fi + +AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) +AC_SUBST(AVCODEC_CFLAGS) +AC_SUBST(AVCODEC_LIBS) +AC_SUBST(AVCODEC_HEADER) + +PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) +AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") + +AC_ARG_WITH([speex], + AS_HELP_STRING([--with-speex={builtin|lib|no}], + [build speex resampler (built-in code, link with external lib, or no build)]), + [PPH=$withval], [PPH="lib"]) + +USE_LIBSPEEX="" +if test "$PPH" = "lib"; then + if test "$HAVE_SPEEXDSP" = "yes"; then + AC_CHECK_LIB([speexdsp], [speex_resampler_init], + [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""]) + fi + if test "$USE_LIBSPEEX" = "yes"; then + AC_DEFINE(USE_LIBSPEEX, 1, "Link with libspeex for resampler") + else + echo "No libspeex with resampler unit; use built-in code" + PPH="builtin" + fi +fi + +AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") +AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib") + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix + +dnl ALSA plugin directory +AC_ARG_WITH(plugindir, + AS_HELP_STRING([--with-plugindir=dir], + [path where ALSA plugin files are stored]), + plugindir="$withval", plugindir="") +if test -z "$plugindir"; then + eval dir="$libdir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + plugindir="$dir/alsa-lib" +fi +AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add-on modules]) +ALSA_PLUGIN_DIR="$plugindir" +AC_SUBST(ALSA_PLUGIN_DIR) + +dnl ALSA data directory +AC_ARG_WITH(alsadatadir, + AS_HELP_STRING([--with-alsadatadir=dir], + [path where ALSA data files are stored]), + alsadatadir="$withval", alsadatadir="") +if test -z "$alsadatadir"; then + eval dir="$datadir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + alsadatadir="$dir/alsa" +fi +AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA data files]) +ALSA_DATA_DIR="$alsadatadir" +AC_SUBST(ALSA_DATA_DIR) + +SAVE_PLUGINS_VERSION + +AC_OUTPUT([ + Makefile + oss/Makefile + pph/Makefile + jack/Makefile + pulse/Makefile + mix/Makefile + rate/Makefile + a52/Makefile + rate-lavc/Makefile + maemo/Makefile + doc/Makefile + usb_stream/Makefile + speex/Makefile + arcam-av/Makefile +]) + +dnl Show the build conditions + +echo +echo "Plugin directory: $ALSA_PLUGIN_DIR" +echo "ALSA_CFLAGS: $ALSA_CFLAGS" +echo "ALSA_LIBS: $ALSA_LIBS" +echo "JACK plugin: $HAVE_JACK" +if test "$HAVE_JACK" = "yes"; then + echo " JACK_CFLAGS: $JACK_CFLAGS" + echo " JACK_LIBS: $JACK_LIBS" +fi +echo "Pulseaudio plugin: $HAVE_PULSE" +if test "$HAVE_PULSE" = "yes"; then + echo " pulseaudio_CFLAGS: $pulseaudio_CFLAGS" + echo " pulseaudio_LIBS: $pulseaudio_LIBS" +fi +echo "Samplerate plugin: $HAVE_SAMPLERATE" +if test "$HAVE_SAMPLERATE" = "yes"; then + echo " samplerate_CFLAGS: $samplerate_CFLAGS" + echo " samplerate_LIBS: $samplerate_LIBS" +fi +echo "Maemo plugin: $HAVE_MAEMO_PLUGIN" +echo " Using Osso resource manager: $use_maemo_rm" +echo "A52, lavc plugins: $HAVE_AVCODEC" +if test "$HAVE_AVCODEC" = "yes"; then + echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS" + echo " AVCODEC_LIBS: $AVCODEC_LIBS" + echo " AVCODEC_HEADER: $AVCODEC_HEADER" +fi +echo "Speex rate plugin: $PPH" +echo "Speex preprocess plugin: $HAVE_SPEEXDSP" +if test "$HAVE_SPEEX" = "yes"; then + echo " speexdsp_CFLAGS: $speexdsp_CFLAGS" + echo " speexdsp_LIBS: $speexdsp_LIBS" +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/configure.in new/alsa-plugins-1.0.28/configure.in --- old/alsa-plugins-1.0.27/configure.in 2013-04-11 13:43:08.000000000 +0200 +++ new/alsa-plugins-1.0.28/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,224 +0,0 @@ -AC_PREREQ(2.59) -AC_INIT(oss/pcm_oss.c) -AM_INIT_AUTOMAKE(alsa-plugins, 1.0.27) -AC_PREFIX_DEFAULT(/usr) - -AC_CONFIG_HEADERS(config.h) -AC_CONFIG_MACRO_DIR([m4]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_DISABLE_STATIC -AM_PROG_LIBTOOL -AC_HEADER_STDC - -CC_NOUNDEFINED - -PKG_CHECK_MODULES(ALSA, alsa >= 1.0.11) -AC_CHECK_LIB(asound, snd_pcm_ioplug_create,, - AC_ERROR([*** libasound has no external plugin SDK]), -ldl) - -AC_ARG_ENABLE([jack], - AS_HELP_STRING([--disable-jack], [Disable building of JACK plugin])) - -if test "x$enable_jack" != "xno"; then - PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no]) -fi -AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes) - -AC_ARG_ENABLE([pulseaudio], - AS_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) - -if test "x$enable_pulseaudio" != "xno"; then - PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.11], [HAVE_PULSE=yes], [HAVE_PULSE=no]) -fi -AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes) - -AC_ARG_ENABLE([samplerate], - AS_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin])) - -if test "x$enable_samplerate" != "xno"; then - PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no]) -fi -AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes) - -AC_ARG_ENABLE([maemo-plugin], - AS_HELP_STRING([--enable-maemo-plugin], - [Build Maemo DSP plugin]), - [HAVE_MAEMO_PLUGIN="$enableval"], [HAVE_MAEMO_PLUGIN="no"]) -AM_CONDITIONAL(HAVE_MAEMO_PLUGIN, test x$HAVE_MAEMO_PLUGIN = xyes) - -AC_ARG_ENABLE([maemo-resource-manager], - AS_HELP_STRING([--enable-maemo-resource-manager], - [Use Maemo resource manager]), - [use_maemo_rm="$enableval"], [use_maemo_rm="no"]) - -if test "$use_maemo_rm" = "yes"; then - PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=yes], [HAVE_DBUS=no]) - - if test "$HAVE_DBUS" = "yes"; then - AC_DEFINE(USE_RESOURCE_MANAGER, 1,"Use dbus server as a resouce manager") - else - AC_ERROR([You must have D-Bus installed if you want to enable the Maemo resource manager]) - fi -fi - -AC_ARG_ENABLE([avcodec], - AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)])) - -if test "x$enable_avcodec" != "xno"; then - PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) -fi - -if test "x$HAVE_AVCODEC" = "xno"; then - AC_ARG_WITH([avcodec-includedir], - AS_HELP_STRING([--with-avcodec-includedir=dir], - [AVcodec include directory]), - [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""]) - AC_ARG_WITH([avcodec-libdir], - AS_HELP_STRING([--with-avcodec-libdir=dir], - [AVcodec library directory]), - [AVCODEC_LIBS="-L$withval"], [AVCODEC_LIBS=""]) - - CFLAGS_saved="$CFLAGS" - LDFLAGS_saved="$LDFLAGS" - CFLAGS="$CFLAGS $AVCODEC_CFLAGS" - LDFLAGS="$LDFLAGS $AVCODEC_LIBS" - AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec" - AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no]) - CFLAGS="$CFLAGS_saved" - LDFLAGS="$LDFLAGS_saved" -fi - -if test $HAVE_AVCODEC = yes; then - AVCODEC_HEADER="" - AC_CHECK_HEADER([ffmpeg/avcodec.h], [AVCODEC_HEADER='<ffmpeg/avcodec.h>']) - if test -z "$AVCODEC_HEADER"; then - AC_CHECK_HEADER([libavcodec/avcodec.h], [AVCODEC_HEADER='<libavcodec/avcodec.h>']) - fi - if test -z "$AVCODEC_HEADER"; then - HAVE_AVCODEC=no - fi -fi - -AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes) -AC_SUBST(AVCODEC_CFLAGS) -AC_SUBST(AVCODEC_LIBS) -AC_SUBST(AVCODEC_HEADER) - -PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) -AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") - -AC_ARG_WITH([speex], - AS_HELP_STRING([--with-speex={builtin|lib|no}], - [build speex resampler (built-in code, link with external lib, or no build)]), - [PPH=$withval], [PPH="lib"]) - -USE_LIBSPEEX="" -if test "$PPH" = "lib"; then - if test "$HAVE_SPEEXDSP" = "yes"; then - AC_CHECK_LIB([speexdsp], [speex_resampler_init], - [USE_LIBSPEEX="yes"], [USE_LIBSPEEX=""]) - fi - if test "$USE_LIBSPEEX" = "yes"; then - AC_DEFINE(USE_LIBSPEEX, 1, "Link with libspeex for resampler") - else - echo "No libspeex with resampler unit; use built-in code" - PPH="builtin" - fi -fi - -AM_CONDITIONAL(HAVE_PPH, test "$PPH" = "builtin" -o "$PPH" = "lib") -AM_CONDITIONAL(USE_LIBSPEEX, test "$PPH" = "lib") - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix - -dnl ALSA plugin directory -AC_ARG_WITH(plugindir, - AS_HELP_STRING([--with-plugindir=dir], - [path where ALSA plugin files are stored]), - plugindir="$withval", plugindir="") -if test -z "$plugindir"; then - eval dir="$libdir" - case "$dir" in - /*) ;; - *) dir="$dir" - esac - plugindir="$dir/alsa-lib" -fi -AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add-on modules]) -ALSA_PLUGIN_DIR="$plugindir" -AC_SUBST(ALSA_PLUGIN_DIR) - -dnl ALSA data directory -AC_ARG_WITH(alsadatadir, - AS_HELP_STRING([--with-alsadatadir=dir], - [path where ALSA data files are stored]), - alsadatadir="$withval", alsadatadir="") -if test -z "$alsadatadir"; then - eval dir="$datadir" - case "$dir" in - /*) ;; - *) dir="$dir" - esac - alsadatadir="$dir/alsa" -fi -AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA data files]) -ALSA_DATA_DIR="$alsadatadir" -AC_SUBST(ALSA_DATA_DIR) - -SAVE_PLUGINS_VERSION - -AC_OUTPUT([ - Makefile - oss/Makefile - pph/Makefile - jack/Makefile - pulse/Makefile - mix/Makefile - rate/Makefile - a52/Makefile - rate-lavc/Makefile - maemo/Makefile - doc/Makefile - usb_stream/Makefile - speex/Makefile - arcam-av/Makefile -]) - -dnl Show the build conditions - -echo -echo "Plugin directory: $ALSA_PLUGIN_DIR" -echo "ALSA_CFLAGS: $ALSA_CFLAGS" -echo "ALSA_LIBS: $ALSA_LIBS" -echo "JACK plugin: $HAVE_JACK" -if test "$HAVE_JACK" = "yes"; then - echo " JACK_CFLAGS: $JACK_CFLAGS" - echo " JACK_LIBS: $JACK_LIBS" -fi -echo "Pulseaudio plugin: $HAVE_PULSE" -if test "$HAVE_PULSE" = "yes"; then - echo " pulseaudio_CFLAGS: $pulseaudio_CFLAGS" - echo " pulseaudio_LIBS: $pulseaudio_LIBS" -fi -echo "Samplerate plugin: $HAVE_SAMPLERATE" -if test "$HAVE_SAMPLERATE" = "yes"; then - echo " samplerate_CFLAGS: $samplerate_CFLAGS" - echo " samplerate_LIBS: $samplerate_LIBS" -fi -echo "Maemo plugin: $HAVE_MAEMO_PLUGIN" -echo " Using Osso resource manager: $use_maemo_rm" -echo "A52, lavc plugins: $HAVE_AVCODEC" -if test "$HAVE_AVCODEC" = "yes"; then - echo " AVCODEC_CFLAGS: $AVCODEC_CFLAGS" - echo " AVCODEC_LIBS: $AVCODEC_LIBS" - echo " AVCODEC_HEADER: $AVCODEC_HEADER" -fi -echo "Speex rate plugin: $PPH" -echo "Speex preprocess plugin: $HAVE_SPEEXDSP" -if test "$HAVE_SPEEX" = "yes"; then - echo " speexdsp_CFLAGS: $speexdsp_CFLAGS" - echo " speexdsp_LIBS: $speexdsp_LIBS" -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/jack/pcm_jack.c new/alsa-plugins-1.0.28/jack/pcm_jack.c --- old/alsa-plugins-1.0.27/jack/pcm_jack.c 2013-04-11 13:43:08.000000000 +0200 +++ new/alsa-plugins-1.0.28/jack/pcm_jack.c 2014-06-12 11:32:45.000000000 +0200 @@ -42,6 +42,7 @@ unsigned int num_ports; unsigned int hw_ptr; unsigned int sample_bits; + snd_pcm_uframes_t min_avail; unsigned int channels; snd_pcm_channel_area_t *areas; @@ -50,6 +51,42 @@ jack_client_t *client; } snd_pcm_jack_t; +static int snd_pcm_jack_stop(snd_pcm_ioplug_t *io); + +static int pcm_poll_block_check(snd_pcm_ioplug_t *io) +{ + static char buf[32]; + snd_pcm_sframes_t avail; + snd_pcm_jack_t *jack = io->private_data; + + if (io->state == SND_PCM_STATE_RUNNING || + (io->state == SND_PCM_STATE_PREPARED && io->stream == SND_PCM_STREAM_CAPTURE)) { + avail = snd_pcm_avail_update(io->pcm); + if (avail >= 0 && avail < jack->min_avail) { + while (read(io->poll_fd, &buf, sizeof(buf)) == sizeof(buf)) + ; + return 1; + } + } + + return 0; +} + +static int pcm_poll_unblock_check(snd_pcm_ioplug_t *io) +{ + static char buf[1]; + snd_pcm_sframes_t avail; + snd_pcm_jack_t *jack = io->private_data; + + avail = snd_pcm_avail_update(io->pcm); + if (avail < 0 || avail >= jack->min_avail) { + write(jack->fd, &buf, 1); + return 1; + } + + return 0; +} + static void snd_pcm_jack_free(snd_pcm_jack_t *jack) { if (jack) { @@ -81,14 +118,10 @@ struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { - static char buf[1]; - assert(pfds && nfds == 1 && revents); - read(pfds[0].fd, buf, 1); - *revents = pfds[0].revents & ~(POLLIN | POLLOUT); - if (pfds[0].revents & POLLIN) + if (pfds[0].revents & POLLIN && !pcm_poll_block_check(io)) *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN; return 0; } @@ -105,7 +138,6 @@ snd_pcm_jack_t *jack = io->private_data; const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t xfer = 0; - static char buf[1]; unsigned int channel; for (channel = 0; channel < io->channels; channel++) { @@ -145,7 +177,7 @@ xfer += frames; } - write(jack->fd, buf, 1); /* for polling */ + pcm_poll_unblock_check(io); /* unblock socket for polling if needed */ return 0; } @@ -154,9 +186,26 @@ { snd_pcm_jack_t *jack = io->private_data; unsigned int i; + snd_pcm_sw_params_t *swparams; + int err; jack->hw_ptr = 0; + jack->min_avail = io->period_size; + snd_pcm_sw_params_alloca(&swparams); + err = snd_pcm_sw_params_current(io->pcm, swparams); + if (err == 0) { + snd_pcm_sw_params_get_avail_min(swparams, &jack->min_avail); + } + + /* deactivate jack connections if this is XRUN recovery */ + snd_pcm_jack_stop(io); + + if (io->stream == SND_PCM_STREAM_PLAYBACK) + pcm_poll_unblock_check(io); /* playback pcm initially accepts writes */ + else + pcm_poll_block_check(io); /* block capture pcm if that's XRUN recovery */ + if (jack->ports) return 0; @@ -356,20 +405,27 @@ return -EINVAL; } - if (snprintf(jack_client_name, sizeof(jack_client_name), "alsa-jack.%s%s.%d.%d", name, - stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", getpid(), num++) - >= (int)sizeof(jack_client_name)) { + if (name == NULL) + err = snprintf(jack_client_name, sizeof(jack_client_name), + "alsa-jack.%s%s.%d.%d", name, + stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", + getpid(), num++); + else + err = snprintf(jack_client_name, sizeof(jack_client_name), + "%s", name); + + if (err >= (int)sizeof(jack_client_name)) { fprintf(stderr, "%s: WARNING: JACK client name '%s' truncated to %d characters, might not be unique\n", __func__, jack_client_name, (int)strlen(jack_client_name)); } - jack->client = jack_client_new(jack_client_name); + jack->client = jack_client_open(jack_client_name, JackNoStartServer, NULL); if (jack->client == 0) { snd_pcm_jack_free(jack); return -ENOENT; } - + jack->areas = calloc(jack->channels, sizeof(snd_pcm_channel_area_t)); if (! jack->areas) { snd_pcm_jack_free(jack); @@ -423,6 +479,10 @@ continue; if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0 || strcmp(id, "hint") == 0) continue; + if (strcmp(id, "name") == 0) { + snd_config_get_string(n, &name); + continue; + } if (strcmp(id, "playback_ports") == 0) { if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { SNDERR("Invalid type for %s", id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/mix/pcm_upmix.c new/alsa-plugins-1.0.28/mix/pcm_upmix.c --- old/alsa-plugins-1.0.27/mix/pcm_upmix.c 2013-04-11 13:43:08.000000000 +0200 +++ new/alsa-plugins-1.0.28/mix/pcm_upmix.c 2014-06-12 11:32:45.000000000 +0200 @@ -371,10 +371,63 @@ return 0; } +#if SND_PCM_EXTPLUG_VERSION >= 0x102 +static unsigned int chmap[8][8] = { + { SND_CHMAP_MONO }, + { SND_CHMAP_FL, SND_CHMAP_FR }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_FC }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, SND_CHMAP_FC }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, SND_CHMAP_FC, SND_CHMAP_LFE }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, SND_CHMAP_FC, SND_CHMAP_LFE, SND_CHMAP_UNKNOWN }, + { SND_CHMAP_FL, SND_CHMAP_FR, SND_CHMAP_RL, SND_CHMAP_RR, SND_CHMAP_FC, SND_CHMAP_LFE, SND_CHMAP_SL, SND_CHMAP_SR }, +}; + +static snd_pcm_chmap_query_t **upmix_query_chmaps(snd_pcm_extplug_t *ext ATTRIBUTE_UNUSED) +{ + snd_pcm_chmap_query_t **maps; + int i; + + maps = calloc(9, sizeof(void *)); + if (!maps) + return NULL; + for (i = 0; i < 8; i++) { + snd_pcm_chmap_query_t *p; + p = maps[i] = calloc(i + 1 + 2, sizeof(int)); + if (!p) { + snd_pcm_free_chmaps(maps); + return NULL; + } + p->type = SND_CHMAP_TYPE_FIXED; + p->map.channels = i + 1; + memcpy(p->map.pos, &chmap[i][0], (i + 1) * sizeof(int)); + } + return maps; +} + +static snd_pcm_chmap_t *upmix_get_chmap(snd_pcm_extplug_t *ext) +{ + snd_pcm_chmap_t *map; + + if (ext->channels < 1 || ext->channels > 8) + return NULL; + map = malloc((ext->channels + 1) * sizeof(int)); + if (!map) + return NULL; + map->channels = ext->channels; + memcpy(map->pos, &chmap[ext->channels - 1][0], ext->channels * sizeof(int)); + return map; +} +#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */ + static const snd_pcm_extplug_callback_t upmix_callback = { .transfer = upmix_transfer, .init = upmix_init, .close = upmix_close, +#if SND_PCM_EXTPLUG_VERSION >= 0x102 + .query_chmaps = upmix_query_chmaps, + .get_chmap = upmix_get_chmap, +#endif }; SND_PCM_PLUGIN_DEFINE_FUNC(upmix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/mix/pcm_vdownmix.c new/alsa-plugins-1.0.28/mix/pcm_vdownmix.c --- old/alsa-plugins-1.0.27/mix/pcm_vdownmix.c 2013-04-11 13:43:08.000000000 +0200 +++ new/alsa-plugins-1.0.28/mix/pcm_vdownmix.c 2014-06-12 11:32:45.000000000 +0200 @@ -277,10 +277,58 @@ return 0; } +#if SND_PCM_EXTPLUG_VERSION >= 0x102 +static unsigned int chmap[6] = { + SND_CHMAP_FL, SND_CHMAP_FR, + SND_CHMAP_RL, SND_CHMAP_RR, + SND_CHMAP_FC, SND_CHMAP_LFE, +}; + +static snd_pcm_chmap_query_t **vdownmix_query_chmaps(snd_pcm_extplug_t *ext ATTRIBUTE_UNUSED) +{ + snd_pcm_chmap_query_t **maps; + int i; + + maps = calloc(4, sizeof(void *)); + if (!maps) + return NULL; + for (i = 0; i < 3; i++) { + snd_pcm_chmap_query_t *p; + p = maps[i] = calloc(i + 4 + 2, sizeof(int)); + if (!p) { + snd_pcm_free_chmaps(maps); + return NULL; + } + p->type = SND_CHMAP_TYPE_FIXED; + p->map.channels = i + 4; + memcpy(p->map.pos, chmap, (i + 4) * sizeof(int)); + } + return maps; +} + +static snd_pcm_chmap_t *vdownmix_get_chmap(snd_pcm_extplug_t *ext) +{ + snd_pcm_chmap_t *map; + + if (ext->channels < 4 || ext->channels > 6) + return NULL; + map = malloc((ext->channels + 1) * sizeof(int)); + if (!map) + return NULL; + map->channels = ext->channels; + memcpy(map->pos, chmap, ext->channels * sizeof(int)); + return map; +} +#endif /* SND_PCM_EXTPLUG_VERSION >= 0x102 */ + static const snd_pcm_extplug_callback_t vdownmix_callback = { .transfer = vdownmix_transfer, .init = vdownmix_init, /* .dump = filr_dump, */ +#if SND_PCM_EXTPLUG_VERSION >= 0x102 + .query_chmaps = vdownmix_query_chmaps, + .get_chmap = vdownmix_get_chmap, +#endif }; SND_PCM_PLUGIN_DEFINE_FUNC(vdownmix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.27/version new/alsa-plugins-1.0.28/version --- old/alsa-plugins-1.0.27/version 2013-04-11 14:54:28.000000000 +0200 +++ new/alsa-plugins-1.0.28/version 2014-06-13 11:23:48.000000000 +0200 @@ -1 +1 @@ -1.0.27 +1.0.28 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-utils for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa-utils for openSUSE:Factory checked in at 2014-06-25 06:57:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-utils (Old) and /work/SRC/openSUSE:Factory/.alsa-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-utils/alsa-utils.changes 2014-03-16 08:05:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-utils.new/alsa-utils.changes 2014-06-25 06:57:39.000000000 +0200 @@ -1,0 +2,28 @@ +Wed Jun 18 13:10:03 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-utils 1.0.28: + All pervious fix patches are obsoleted: + 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch + 0002-alsaloop-fix-wrong-alias-for-signal.h.patch + 0003-aplay-fix-two-off-by-one-errors.patch + 0004-alsaloop-add-z-syslog-option-to-use-syslog-for-error.patch + 0005-amixer-actually-print-all-TLVs-in-a-container-TLV.patch + 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch + 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch + 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch + 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch + 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch + 0011-alsaconf-support-newer-m-i-t-and-kmod.patch + 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch + 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch + 0014-alsactl-Add-monitor-command.patch + 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch + 0016-alsactl-monitor-all-cards-as-default.patch + 0017-alsactl-Fix-the-va_list-initialization-in-cerror_-an.patch + 0018-aplay-fix-pcm_read-return-value.patch + 0019-alsa-restore.rules-refer-to-correct-attr.patch + 0020-aplay-fix-timespec-to-msec-conversion.patch + 0021-speaker-test-add-force-frequency-option-to-allow-hz-.patch + 0022-speaker-test-update-man-page-for-new-X-arg-also-cons.patch + +------------------------------------------------------------------- Old: ---- 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch 0002-alsaloop-fix-wrong-alias-for-signal.h.patch 0003-aplay-fix-two-off-by-one-errors.patch 0004-alsaloop-add-z-syslog-option-to-use-syslog-for-error.patch 0005-amixer-actually-print-all-TLVs-in-a-container-TLV.patch 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch 0011-alsaconf-support-newer-m-i-t-and-kmod.patch 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch 0014-alsactl-Add-monitor-command.patch 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch 0016-alsactl-monitor-all-cards-as-default.patch 0017-alsactl-Fix-the-va_list-initialization-in-cerror_-an.patch 0018-aplay-fix-pcm_read-return-value.patch 0019-alsa-restore.rules-refer-to-correct-attr.patch 0020-aplay-fix-timespec-to-msec-conversion.patch 0021-speaker-test-add-force-frequency-option-to-allow-hz-.patch 0022-speaker-test-update-man-page-for-new-X-arg-also-cons.patch alsa-utils-1.0.27.2.tar.bz2 New: ---- alsa-utils-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-utils.spec ++++++ --- /var/tmp/diff_new_pack.rRasRQ/_old 2014-06-25 06:57:40.000000000 +0200 +++ /var/tmp/diff_new_pack.rRasRQ/_new 2014-06-25 06:57:40.000000000 +0200 @@ -16,7 +16,7 @@ # -%define package_version 1.0.27.2 +%define package_version 1.0.28 # %if 0%{?suse_version} > 1130 %define use_systemd 1 @@ -35,7 +35,7 @@ %define _udevdir /lib/udev %endif Name: alsa-utils -Version: 1.0.27.2 +Version: 1.0.28 Release: 0 Summary: Advanced Linux Sound Architecture Utilities License: GPL-2.0+ @@ -48,28 +48,6 @@ Source12: ja.po # Patch: alsa-utils-git-fixes.diff # upstream fix patches -Patch1: 0001-alsactl-alsa-state.service-fix-typo-rkill-kill.patch -Patch2: 0002-alsaloop-fix-wrong-alias-for-signal.h.patch -Patch3: 0003-aplay-fix-two-off-by-one-errors.patch -Patch4: 0004-alsaloop-add-z-syslog-option-to-use-syslog-for-error.patch -Patch5: 0005-amixer-actually-print-all-TLVs-in-a-container-TLV.patch -Patch6: 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch -Patch7: 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch -Patch8: 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch -Patch9: 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch -Patch10: 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch -Patch11: 0011-alsaconf-support-newer-m-i-t-and-kmod.patch -Patch12: 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch -Patch13: 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch -Patch14: 0014-alsactl-Add-monitor-command.patch -Patch15: 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch -Patch16: 0016-alsactl-monitor-all-cards-as-default.patch -Patch17: 0017-alsactl-Fix-the-va_list-initialization-in-cerror_-an.patch -Patch18: 0018-aplay-fix-pcm_read-return-value.patch -Patch19: 0019-alsa-restore.rules-refer-to-correct-attr.patch -Patch20: 0020-aplay-fix-timespec-to-msec-conversion.patch -Patch21: 0021-speaker-test-add-force-frequency-option-to-allow-hz-.patch -Patch22: 0022-speaker-test-update-man-page-for-new-X-arg-also-cons.patch # Patch99: alsa-utils-gettext-version-removal.diff BuildRequires: alsa-devel @@ -101,28 +79,6 @@ cp %{SOURCE11} po/ cp %{SOURCE12} po/ # patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 # %if 0%{?suse_version} < 1020 %patch99 -p1 ++++++ alsa-utils-1.0.27.2.tar.bz2 -> alsa-utils-1.0.28.tar.bz2 ++++++ ++++ 5238 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 alsa for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at 2014-06-25 06:57:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa (Old) and /work/SRC/openSUSE:Factory/.alsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa/alsa.changes 2014-04-04 16:32:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa.new/alsa.changes 2014-06-25 06:57:36.000000000 +0200 @@ -1,0 +2,45 @@ +Wed Jun 18 13:08:38 CEST 2014 - tiwai(a)suse.de + +- Updated to alsa-lib 1.0.28: + All pervious fix patches are obsoleted: + 0001-local.h-use-__kernel_off_t-from-linux-types.h.patch + 0002-conf-cards-add-Audio-Advantage-Micro-II.patch + 0003-pcm-Fix-a-wrong-value-shown-in-the-error-message-in-.patch + 0004-UCM-Document-some-standard-values.patch + 0005-hdspm.h-Update-LTC-ioctl-to-use-struct-hdspm_ltc.patch + 0006-Update-iatomic.h-functions-definitions-for-mips.patch + 0007-Fix-access-of-freed-memory-in-namehints.patch + 0008-HDA-Intel-present-up-to-8-HDMI-DP-outputs-via-hdmi-d.patch + 0009-snd_tlv_convert_from_dB-fix-decreasing-gain-across-e.patch + 0010-remove-unnecessary-obsolete-compat-hsearch_r.c.patch + 0011-local.h-include-sys-types.h-to-fix-issues-with-pcm.h.patch + 0012-test-chmap-Add-missing-usage-text-for-s-option.patch + 0013-include-global.h-don-t-define-timeval-and-timespec-s.patch + 0014-conf.c-use-portable-way-to-initialize-recursive-mute.patch + 0015-pcm_file-fix-SEGFAULT-if-file-option-is-missing-whil.patch + 0016-pcm_file-fixed-memory-leak.patch + 0017-pcm_file-don-t-touch-infile-on-playback-and-output-f.patch + 0018-pcm_file-document-new-argument-to-snd_pcm_file_open.patch + 0019-dmix-Don-t-use-assert-and-abort.patch + 0020-minor-malloc-changes.patch + 0021-alsa-lib-minor-typo-in-pcm-doc.patch + 0022-control_hw-fix-potential-memory-leak.patch + 0023-pcm-initialize-pcm_dmix-monotonic-field.patch + 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch + 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch + 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch + 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch + 0028-conf-Add-surround-2.1-support-to-all-cards.patch + 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch + 0030-autotools-update-style.patch + 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch + 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch + 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch + 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch + 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch + 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch + 0037-route-Return-NULL-in-case-of-zero-found-channels-in-.patch + 0038-route-Fix-invalid-pointer-access.patch + 0039-pcm-ladspa-Delay-LADSPA-plugin-activate-call.patch + +------------------------------------------------------------------- Old: ---- 0001-local.h-use-__kernel_off_t-from-linux-types.h.patch 0002-conf-cards-add-Audio-Advantage-Micro-II.patch 0003-pcm-Fix-a-wrong-value-shown-in-the-error-message-in-.patch 0004-UCM-Document-some-standard-values.patch 0005-hdspm.h-Update-LTC-ioctl-to-use-struct-hdspm_ltc.patch 0006-Update-iatomic.h-functions-definitions-for-mips.patch 0007-Fix-access-of-freed-memory-in-namehints.patch 0008-HDA-Intel-present-up-to-8-HDMI-DP-outputs-via-hdmi-d.patch 0009-snd_tlv_convert_from_dB-fix-decreasing-gain-across-e.patch 0010-remove-unnecessary-obsolete-compat-hsearch_r.c.patch 0011-local.h-include-sys-types.h-to-fix-issues-with-pcm.h.patch 0012-test-chmap-Add-missing-usage-text-for-s-option.patch 0013-include-global.h-don-t-define-timeval-and-timespec-s.patch 0014-conf.c-use-portable-way-to-initialize-recursive-mute.patch 0015-pcm_file-fix-SEGFAULT-if-file-option-is-missing-whil.patch 0016-pcm_file-fixed-memory-leak.patch 0017-pcm_file-don-t-touch-infile-on-playback-and-output-f.patch 0018-pcm_file-document-new-argument-to-snd_pcm_file_open.patch 0019-dmix-Don-t-use-assert-and-abort.patch 0020-minor-malloc-changes.patch 0021-alsa-lib-minor-typo-in-pcm-doc.patch 0022-control_hw-fix-potential-memory-leak.patch 0023-pcm-initialize-pcm_dmix-monotonic-field.patch 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch 0028-conf-Add-surround-2.1-support-to-all-cards.patch 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch 0030-autotools-update-style.patch 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch 0037-route-Return-NULL-in-case-of-zero-found-channels-in-.patch 0038-route-Fix-invalid-pointer-access.patch 0039-pcm-ladspa-Delay-LADSPA-plugin-activate-call.patch alsa-lib-1.0.27.2.tar.bz2 New: ---- alsa-lib-1.0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.viaztC/_old 2014-06-25 06:57:37.000000000 +0200 +++ /var/tmp/diff_new_pack.viaztC/_new 2014-06-25 06:57:37.000000000 +0200 @@ -16,14 +16,14 @@ # -%define package_version 1.0.27.2 +%define package_version 1.0.28 %if 0%{?suse_version} > 1200 %define _udevdir %(pkg-config --variable=udevdir udev) %else %define _udevdir /lib/udev %endif Name: alsa -Version: 1.0.27.2 +Version: 1.0.28 Release: 0 # Summary: Advanced Linux Sound Architecture @@ -52,45 +52,6 @@ Source50: Loopback.conf # Patch: alsa-lib-git-fixes.diff # upstream fixes -Patch1: 0001-local.h-use-__kernel_off_t-from-linux-types.h.patch -Patch2: 0002-conf-cards-add-Audio-Advantage-Micro-II.patch -Patch3: 0003-pcm-Fix-a-wrong-value-shown-in-the-error-message-in-.patch -Patch4: 0004-UCM-Document-some-standard-values.patch -Patch5: 0005-hdspm.h-Update-LTC-ioctl-to-use-struct-hdspm_ltc.patch -Patch6: 0006-Update-iatomic.h-functions-definitions-for-mips.patch -Patch7: 0007-Fix-access-of-freed-memory-in-namehints.patch -Patch8: 0008-HDA-Intel-present-up-to-8-HDMI-DP-outputs-via-hdmi-d.patch -Patch9: 0009-snd_tlv_convert_from_dB-fix-decreasing-gain-across-e.patch -Patch10: 0010-remove-unnecessary-obsolete-compat-hsearch_r.c.patch -Patch11: 0011-local.h-include-sys-types.h-to-fix-issues-with-pcm.h.patch -Patch12: 0012-test-chmap-Add-missing-usage-text-for-s-option.patch -Patch13: 0013-include-global.h-don-t-define-timeval-and-timespec-s.patch -Patch14: 0014-conf.c-use-portable-way-to-initialize-recursive-mute.patch -Patch15: 0015-pcm_file-fix-SEGFAULT-if-file-option-is-missing-whil.patch -Patch16: 0016-pcm_file-fixed-memory-leak.patch -Patch17: 0017-pcm_file-don-t-touch-infile-on-playback-and-output-f.patch -Patch18: 0018-pcm_file-document-new-argument-to-snd_pcm_file_open.patch -Patch19: 0019-dmix-Don-t-use-assert-and-abort.patch -Patch20: 0020-minor-malloc-changes.patch -Patch21: 0021-alsa-lib-minor-typo-in-pcm-doc.patch -Patch22: 0022-control_hw-fix-potential-memory-leak.patch -Patch23: 0023-pcm-initialize-pcm_dmix-monotonic-field.patch -Patch24: 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch -Patch25: 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch -Patch26: 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch -Patch27: 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch -Patch28: 0028-conf-Add-surround-2.1-support-to-all-cards.patch -Patch29: 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch -Patch30: 0030-autotools-update-style.patch -Patch31: 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch -Patch32: 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch -Patch33: 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch -Patch34: 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch -Patch35: 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch -Patch36: 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch -Patch37: 0037-route-Return-NULL-in-case-of-zero-found-channels-in-.patch -Patch38: 0038-route-Fix-invalid-pointer-access.patch -Patch39: 0039-pcm-ladspa-Delay-LADSPA-plugin-activate-call.patch # rest suse patches Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff BuildRequires: doxygen @@ -160,45 +121,6 @@ %setup -q -n alsa-lib-%{package_version} cp %{SOURCE50} src/conf/cards # %patch -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 %if 0%{?suse_version} == 1130 %patch99 -p1 %endif ++++++ alsa-lib-1.0.27.2.tar.bz2 -> alsa-lib-1.0.28.tar.bz2 ++++++ ++++ 6834 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 libprison for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '14

25 Jun '14

Hello community, here is the log from the commit of package libprison for openSUSE:Factory checked in at 2014-06-25 06:57:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libprison (Old) and /work/SRC/openSUSE:Factory/.libprison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libprison" Changes: -------- --- /work/SRC/openSUSE:Factory/libprison/libprison.changes 2014-03-18 13:49:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libprison.new/libprison.changes 2014-06-25 06:57:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 17 16:14:35 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 1.1.1 + * Fixed internal library versioning + +------------------------------------------------------------------- Old: ---- prison-1.1.0.tar.xz New: ---- prison-1.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libprison.spec ++++++ --- /var/tmp/diff_new_pack.GBK4kT/_old 2014-06-25 06:57:35.000000000 +0200 +++ /var/tmp/diff_new_pack.GBK4kT/_new 2014-06-25 06:57:35.000000000 +0200 @@ -18,13 +18,13 @@ Name: libprison %define rname prison -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Qt api to produce QRCode and DataMatrix barcodes License: MIT Group: Development/Libraries/C and C++ Url: https://projects.kde.org/projects/prison -Source: %{rname}-%{version}.tar.xz +Source: http://download.kde.org/stable/prison/%{version}/src/%{rname}-%{version}.ta… BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libdmtx-devel ++++++ prison-1.1.0.tar.xz -> prison-1.1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/prison-1.1.0/lib/prison/CMakeLists.txt new/prison-1.1.1/lib/prison/CMakeLists.txt --- old/prison-1.1.0/lib/prison/CMakeLists.txt 2014-03-16 19:07:42.000000000 +0100 +++ new/prison-1.1.1/lib/prison/CMakeLists.txt 2014-04-05 22:28:30.000000000 +0200 @@ -12,7 +12,7 @@ add_library(prison SHARED ${prison_SRC}) target_link_libraries(prison ${DMTX_LIBRARIES} ${QRENCODE_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -set_target_properties(prison PROPERTIES VERSION "1.1.0" SOVERSION "0" LINK_INTERFACE_LIBRARIES "" DEFINE_SYMBOL BUILDING_PRISON) +set_target_properties(prison PROPERTIES VERSION "0.1.0" SOVERSION "0" LINK_INTERFACE_LIBRARIES "" DEFINE_SYMBOL BUILDING_PRISON) set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0