Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fd889499ecea437e920452a19ce29a7b76ee64fe)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fd889499ecea437e920452a19ce29a7b76ee64fe)
  • Date: Tue, 9 Dec 2008 18:41:36 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/hdparm/CONFIGURE | 3
disk/hdparm/DETAILS | 4
disk/hdparm/HISTORY | 5 +
disk/hdparm/PRE_BUILD | 7 -
disk/hdparm/hdparm-dvdspeed.patch | 183
--------------------------------------
5 files changed, 7 insertions(+), 195 deletions(-)

New commits:
commit 964c42ce1acc19a0f01f49c9aa8d9ff49b6a57f2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

hdparm: version bump to 9.5

diff --git a/disk/hdparm/CONFIGURE b/disk/hdparm/CONFIGURE
deleted file mode 100755
index 025fd14..0000000
--- a/disk/hdparm/CONFIGURE
+++ /dev/null
@@ -1,3 +0,0 @@
-config_query HDPARM_DVD \
-"Add patch for DVD speed setting via -E (certain drives need this) ?" \
-n
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 09773e3..b22eb81 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
SPELL=hdparm
- VERSION=9.3
-
SOURCE_HASH=sha512:20c0b5da2bbac00dfbc98e1cec9e2582fe89aa4414c88f82405d11bbe5121926c1f5f4712c683a201f43af4eeed7fe2b6132cc5710b53ddb448e8eeecc147a68
+ VERSION=9.5
+
SOURCE_HASH=sha512:b3dbb870a7264f085c5f87e048cf40a85b294b8e840b67af11ece3f37866bcacd90323231783b98ed67173ad1c99116ac7cec872a9a20e5ff97949ba34be297e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index 4873bd8..7079915 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,8 @@
+2008-12-10 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 9.5
+ * hdparm-dvdspeed.patch, CONFIGURE, PRE_BUILD: gone
+ the patch is upstream now!
+
2008-12-02 Julien "_kaze_" ROZO <julien AT rozo.org>
* hdparm-8.9-dvd.patch: renamed to hdparm-dvdspeed.patch
* hdparm-dvdspeed.patch: changed so it can be applied on hdparm 9.3
diff --git a/disk/hdparm/PRE_BUILD b/disk/hdparm/PRE_BUILD
deleted file mode 100755
index 09219a1..0000000
--- a/disk/hdparm/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-if [[ "$HDPARM_DVD" = y ]]; then
- message "${MESSAGE_COLOR}Applying DVD speed patch.$DEFAULT_COLOR" &&
- #
http://sourceforge.net/tracker/index.php?func=detail&aid=2043579&group_id=136732&atid=736684
- patch -Np1 < "$SCRIPT_DIRECTORY/hdparm-dvdspeed.patch"
-fi
diff --git a/disk/hdparm/hdparm-dvdspeed.patch
b/disk/hdparm/hdparm-dvdspeed.patch
deleted file mode 100644
index df4d87c..0000000
--- a/disk/hdparm/hdparm-dvdspeed.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-diff -Naur hdparm-9.3/dvdspeed.c hdparm-9.3-dvd/dvdspeed.c
---- hdparm-9.3/dvdspeed.c 1970-01-01 01:00:00.000000000 +0100
-+++ hdparm-9.3-dvd/dvdspeed.c 2008-12-02 23:22:55.000000000 +0100
-@@ -0,0 +1,129 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
-+#include <linux/cdrom.h>
-+/*
-+ * dvdspeed - use SET STREAMING command to set the speed of DVD-drives
-+ *
-+ *
-+ * Copyright (c) 2004 Thomas Fritzsche <tf AT noto.de>
-+ * A bit mangled in 2006 and 2008 by Thomas Orgis <thomas AT orgis.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include "dvdspeed.h" /* just to silence a stupid warning */
-+
-+#ifdef DVDSPEED_STANDALONE
-+/* Just error handling. */
-+void dump_sense(unsigned char *cdb, struct request_sense *sense)
-+{
-+ int i;
-+ printf("Command failed: ");
-+
-+ for (i=0; i<12; i++)
-+ fprintf(stderr, "%02x ", cdb[i]);
-+
-+ if(sense)
-+ {
-+ fprintf(stderr, " - sense: %02x.%02x.%02x\n",
-+ sense->sense_key, sense->asc, sense->ascq);
-+ }
-+ else
-+ {
-+ fprintf(stderr, ", no sense\n");
-+ }
-+}
-+#endif
-+
-+/* This is the interesting code. */
-+int set_dvd_speed(int fd, int speed)
-+{
-+ struct cdrom_generic_command cgc;
-+ struct request_sense sense;
-+ unsigned char buffer[28];
-+ memset(&cgc, 0, sizeof(cgc));
-+ memset(&sense, 0, sizeof(sense));
-+ memset(&buffer, 0, sizeof(buffer));
-+
-+ /* SET STREAMING command */
-+ cgc.cmd[0] = 0xb6;
-+ /* 28 byte parameter list length */
-+ cgc.cmd[10] = 28;
-+ cgc.sense = &sense;
-+ cgc.buffer = buffer;
-+ cgc.buflen = sizeof(buffer);
-+ cgc.data_direction = CGC_DATA_WRITE;
-+
-+ buffer[8] = 0xff;
-+ buffer[9] = 0xff;
-+ buffer[10] = 0xff;
-+ buffer[11] = 0xff;
-+
-+ buffer[15] = 177*speed;
-+ buffer[18] = 0x03;
-+ buffer[19] = 0xE8;
-+
-+ buffer[23] = 177*speed;
-+ buffer[26] = 0x03;
-+ buffer[27] = 0xE8;
-+
-+ if(ioctl(fd, CDROM_SEND_PACKET, &cgc) == 0)
-+ {
-+ #ifdef DVDSPEED_STANDALONE
-+ printf("OK\n");
-+ #endif
-+ return 0;
-+ }
-+ else
-+ {
-+ #ifdef DVDSPEED_STANDALONE
-+ fprintf(stderr, "Error!\n");
-+ dump_sense(cgc.cmd, cgc.sense);
-+ #endif
-+ return -1;
-+ }
-+}
-+
-+#ifdef DVDSPEED_STANDALONE
-+/* main()... should I explain? */
-+int main(int argc, char *argv[])
-+{
-+ int c;
-+ int speed = 0;
-+ int fd;
-+
-+ if(argc != 3)
-+ {
-+ printf("dvdspeed - use SET STREAMING command to set the speed
of DVD-drives\n");
-+ printf("(c) 2004 Thomas Fritzsche, this version (restructure,
help text) prepared by Thomas Orgis\n");
-+ printf("free use under the GPL2, no warranties of any
kind\n\n");
-+ printf("\tusage: dvdspeed <speed> <device>\n\n");
-+ printf("\texample: dvdspeed 8 /dev/hdc\n");
-+ printf("Makes my media box more calm and me happier during
dvd movie watching.\n\n");
-+ printf("This tool may be necessary for (newer) drives that
don't apply the CDROM speed setting of hdparm to DVDs.\n");
-+ printf("One example is my NEC ND-4550, while the ND-1100A
applied the hdparm CDROM speed setting to DVDs as well.\n");
-+ exit(-1);
-+ }
-+
-+ speed = atoi(argv[1]);
-+ fd = open(argv[2], O_RDONLY | O_NONBLOCK);
-+ return set_dvd_speed(fd, speed);
-+}
-+#endif
-diff -Naur hdparm-9.3/dvdspeed.h hdparm-9.3-dvd/dvdspeed.h
---- hdparm-9.3/dvdspeed.h 1970-01-01 01:00:00.000000000 +0100
-+++ hdparm-9.3-dvd/dvdspeed.h 2008-12-02 23:18:12.000000000 +0100
-@@ -0,0 +1 @@
-+int set_dvd_speed(int fd, int speed);
-diff -Naur hdparm-9.3/hdparm.c hdparm-9.3-dvd/hdparm.c
---- hdparm-9.3/hdparm.c 2008-11-04 18:58:32.000000000 +0100
-+++ hdparm-9.3-dvd/hdparm.c 2008-12-02 23:17:25.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <asm/byteorder.h>
-
- #include "hdparm.h"
-+#include "dvdspeed.h"
- #include "sgio.h"
-
- extern const char *minor_str[];
-@@ -1369,6 +1370,12 @@
- err = errno;
- perror(" CDROM_SELECT_SPEED failed");
- }
-+ /* A fix? Applying SET STREAMING command. */
-+ printf("also setting dvd streaming speed to %d\n",
cdromspeed);
-+ if(set_dvd_speed(fd, cdromspeed) != 0)
-+ {
-+ perror(" dvd speed setting failed");
-+ }
- }
- if (set_acoustic) {
- __u8 args[4];
-diff -Naur hdparm-9.3/Makefile hdparm-9.3-dvd/Makefile
---- hdparm-9.3/Makefile 2008-11-02 23:18:05.000000000 +0100
-+++ hdparm-9.3-dvd/Makefile 2008-12-02 23:15:28.000000000 +0100
-@@ -23,7 +23,7 @@
- INSTALL_DIR = $(INSTALL) -m 755 -d
- INSTALL_PROGRAM = $(INSTALL)
-
--OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fibmap.o fwdownload.o
-+OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fibmap.o fwdownload.o
dvdspeed.o
-
- all: hdparm
-
-@@ -33,6 +33,8 @@
-
- hdparm.o: hdparm.h sgio.h
-
-+dvdspeed.o: dvdspeed.c
-+
- identify.o: hdparm.h
-
- sgio.o: sgio.c sgio.h hdparm.h



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (fd889499ecea437e920452a19ce29a7b76ee64fe), Thomas Orgis, 12/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page