From patchwork Tue Aug 29 00:46:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Constantino X-Patchwork-Id: 4871 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp2681121jao; Mon, 28 Aug 2017 17:46:36 -0700 (PDT) X-Received: by 10.223.163.66 with SMTP id d2mr1331757wrb.157.1503967596135; Mon, 28 Aug 2017 17:46:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503967596; cv=none; d=google.com; s=arc-20160816; b=KSL72Il3VsTVP+7j/CfYGcWZzhHAvth0yEr+1+HSvgZtjojyX+zhXkWL6IEREY7QT2 6g0vrSBHfAMzWpP25ZNxG7EyeN5Y2K5vXXqV4pXmlI44hafJfPNff6BqDQiqQlz2Top0 bjXPvInjnFZz6f4wIK+wNe/sgLQ1PEPVNJHggHrmYb2v9C93YdTiOJuCuIALWGN3+twP aIGPu7MmriaMLObXeE+WHP6AlNlQYN+N+ZO+4vzldbv8O5n2RfC6lHYOF7XS6nw7rTBs zwL67qAL5EEg+4XvF4hPO9TFg+/TQ9ukzrAmE+IwlpaDIRWa41JAGA4S34aNWT4+LaKu W0sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=XR8nV6UvZ5fBS9t7FkJNZZbBBh63ZwUvO6V0hDWOQMA=; b=Hptu+zVoQF0JcdXQmn0yZehkMqtkUiruWc00I6I8KafYO6nPtL5nLUFUhq1AI8KUWo 2pF4k5F89fBrNS2/+mtPnR7RhohFkV/5G+xspNfQTAJCqI5Vd64k6Rxz7pZUODVDxcJi 2PHIQMLjIXVKDqJSVroBzzgDCMAGiEX++khNvMD96EXc1XPixffLSHP9WobO9Z+1pEMU W3N9PCvunvgu8cmjk4cj141NEGQ/KSFA+VmUIo5oAeeSqjjq8BIdN8n8C0g6U+TBxMZC PemyCjea01g02NIGqM75+v2YuVJQRYS+YvZZiJ4I7mQoPWY+2YJQeg/iV2D5aMrYshFP TsKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GCXrHAgX; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c9si1286248wrf.242.2017.08.28.17.46.35; Mon, 28 Aug 2017 17:46:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GCXrHAgX; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 420B768A04F; Tue, 29 Aug 2017 03:46:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1DA85689E5D for ; Tue, 29 Aug 2017 03:46:16 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id u26so13014530wma.0 for ; Mon, 28 Aug 2017 17:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=t/c0OfvEvtxctz91dImsXPwhS2e4QheSMMHbunSYIes=; b=GCXrHAgXbw5kD1RYutGEQSJut/0+sxTJNXYYb+eniNnSDOTqq+wyN4gEHouCfnzyqN sQ/bCjWoVx8d04zzNcdmx+0X9GguIgXzYNlHjgdgXrDV6WGWLNu4tNQZUhYQZyXzavoh +x0bnkc0vMtGcr4/wZF9gR0hquBaorq9WieeqkKAZB8ySXblTGj9dFpCWyUs52MwQ/aw g68UfoOvhvTGwklCY65f4slnBxpLpDEijHqYQhrLkGfUIPlMXX7PVCoEYHWdV/GJ81MM 1JvGtZ97ylbTpgoDY8+DYe/uuWYnOxtxbjXCG+NvYs3cnaxRN+K4vjY9WkSUiFvAVOjR FoKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=t/c0OfvEvtxctz91dImsXPwhS2e4QheSMMHbunSYIes=; b=fo3Gate4oaaMptrmLQ4YGCsc94hwqHXY3zixE48PRC1VOyCc89Ka55T/B+SNwPbKQ6 /cpPHB7utIHk4FmpravEulxkGvsafhgB9CaLRZwk0lKaDl14+C8FFHQz6SpKBOZ1QC5D UMfmoOwmFvGXd2UD1XvDvJl76yN5pBjEngPkqIZnks2rL3LpYI+zcDPylE6sOs4TVJrv 1A1pBS8C2iKnYliXuuSfaeWuTJiaupAzqsQS1puhQnqRuShb1TC8MUg7wPAoMJLHQvXz pgfLldckjXSTelGxRDZ4dv6e0bkOLf9oknsoy3mwJ2/tmU9987iA99M6oXHDF4WpTJ6Y 4FDQ== X-Gm-Message-State: AHYfb5iyewYniqI3hL5XbbR9yS2gE9MF8odbzs5SBua3MKXBZeULgRHJ 3nQ0Ip5batPFKiTz6Sc= X-Received: by 10.28.180.138 with SMTP id d132mr177255wmf.158.1503967585635; Mon, 28 Aug 2017 17:46:25 -0700 (PDT) Received: from localhost.localdomain (10.246.114.89.rev.vodafone.pt. [89.114.246.10]) by smtp.gmail.com with ESMTPSA id l143sm1424842wmb.8.2017.08.28.17.46.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Aug 2017 17:46:24 -0700 (PDT) From: Ricardo Constantino To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 Aug 2017 01:46:13 +0100 Message-Id: <20170829004613.1832-1-wiiaboo@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] compat/cuda/ptx2c: strip CR from each line X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Windows nvcc + cl.exe produce a .ctx file with CR+LF newlines which need to be stripped to work with gcc. --- compat/cuda/ptx2c.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/cuda/ptx2c.sh b/compat/cuda/ptx2c.sh index 1f37023290..44b08b6ea2 100755 --- a/compat/cuda/ptx2c.sh +++ b/compat/cuda/ptx2c.sh @@ -29,7 +29,7 @@ NAME="$(basename "$IN" | sed 's/\..*//')" printf "const char %s_ptx[] = \\" "$NAME" > "$OUT" while read LINE do - printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed 's/["\\]/\\&/g')" >> "$OUT" + printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed -e 's/\r//g' -e 's/["\\]/\\&/g')" >> "$OUT" done < "$IN" printf ";\n" >> "$OUT"